Author: koen.aers(a)jboss.com
Date: 2011-08-26 10:27:58 -0400 (Fri, 26 Aug 2011)
New Revision: 34338
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java
Log:
JBIDE-9589: Nullpointer check for Shell when calling showPage
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java
===================================================================
---
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java 2011-08-26
13:14:47 UTC (rev 34337)
+++
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java 2011-08-26
14:27:58 UTC (rev 34338)
@@ -105,19 +105,23 @@
@Override
public void run() {
notRunningMessage = NOT_RUNNING_MESSAGE;
- notRunningPage.setMessage(notRunningMessage);
+ if (!notRunningPage.getControl().isDisposed()) {
+ notRunningPage.setMessage(notRunningMessage);
+ }
showPage(notRunning);
}
});
}
private void showPage(final Control control) {
- getDisplay().asyncExec(new Runnable() {
- @Override
- public void run() {
- pageBook.showPage(control);
- }
- });
+ if (getSite().getShell() != null) {
+ getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ pageBook.showPage(control);
+ }
+ });
+ }
}
private void createRunningPage() {
@@ -193,7 +197,7 @@
}
private Display getDisplay() {
- return getViewSite().getPage().getWorkbenchWindow().getShell().getDisplay();
+ return getSite().getShell().getDisplay();
}
public ForgeRuntime getRuntime() {
Show replies by date