mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-02 13:55:39 +02:00
Code Issues Wiki Activity

Fix NPEs when closing Old Terminal view and avoid opening on top of Welcome

Browse source
This commit is contained in:
Anton Leherbauer 2015-06-01 14:24:29 +02:00
parent 23b3fd4cd0
commit 4ea71eb57e
1 changed files with 77 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler.java
View file

@ -11,10 +11,12 @@ package org.eclipse.tm.terminal.view.ui.view;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants; import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants;
import org.eclipse.ui.IPartListener2;
import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchPartReference;
import org.eclipse.ui.PartInitException; import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.part.ViewPart;
/** /**
@ -25,6 +27,9 @@ import org.eclipse.ui.part.ViewPart;
*/ */
public class OldTerminalsViewHandler extends ViewPart { public class OldTerminalsViewHandler extends ViewPart {
boolean fReplaced;
IPartListener2 fPartlistener;
/** /**
* Constructor. * Constructor.
*/ */
@ -37,26 +42,83 @@ public class OldTerminalsViewHandler extends ViewPart {
*/ */
@Override @Override
public void createPartControl(Composite parent) { public void createPartControl(Composite parent) {
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); replaceWithTerminalsView();
IWorkbenchPage page = window != null ? window.getActivePage() : null;
if (page != null) {
// Show the new view
try {
page.showView(IUIConstants.ID);
}
catch (PartInitException e) { /* ignored on purpose */ }
// Hide ourself in the current perspective
page.hideView(this);
}
} }
protected void replaceWithTerminalsView() {
if (fReplaced)
return;
IViewSite site = getViewSite();
final IWorkbenchPage page = site.getPage();
site.getShell().getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
if (fReplaced)
return;
if (!page.isPageZoomed() || page.getActivePart() instanceof TerminalsView) {
fReplaced = true;
// Show the new view
try {
page.showView(IUIConstants.ID, null, IWorkbenchPage.VIEW_CREATE);
}
catch (PartInitException e) { /* ignored on purpose */ }
// Hide ourself in the current perspective
page.hideView(OldTerminalsViewHandler.this);
} else if (fPartlistener == null) {
final IWorkbenchPart maximizedPart = page.getActivePart();
page.addPartListener(fPartlistener = new IPartListener2() {
@Override
public void partVisible(IWorkbenchPartReference partRef) {
if (partRef.getPart(false) == OldTerminalsViewHandler.this) {
page.removePartListener(this);
fPartlistener = null;
replaceWithTerminalsView();
}
}
@Override
public void partOpened(IWorkbenchPartReference partRef) {
}
@Override
public void partInputChanged(IWorkbenchPartReference partRef) {
}
@Override
public void partHidden(IWorkbenchPartReference partRef) {
}
@Override
public void partDeactivated(IWorkbenchPartReference partRef) {
}
@Override
public void partClosed(IWorkbenchPartReference partRef) {
if (partRef.getPart(false) == OldTerminalsViewHandler.this) {
page.removePartListener(this);
fPartlistener = null;
} else if (partRef.getPart(false) == maximizedPart) {
page.removePartListener(this);
fPartlistener = null;
replaceWithTerminalsView();
}
}
@Override
public void partBroughtToTop(IWorkbenchPartReference partRef) {
}
@Override
public void partActivated(IWorkbenchPartReference partRef) {
}
});
}
}
});
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.ui.part.WorkbenchPart#setFocus() * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
*/ */
@Override @Override
public void setFocus() { public void setFocus() {
// should not happen, but just in case - replace on focus
replaceWithTerminalsView();
} }
} }