Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-12-08 05:27:35 +0000
committerEike Stepper2011-12-08 05:27:35 +0000
commitc8b2dd559e7dcbc28bb1f8b3e9623d7a42165bea (patch)
tree02267c26230fb9790eb5cdc7e3117eb51c6982f5
parent63b4b22a806ca8bd8e8c13e89fddd2b76e433bd6 (diff)
downloadcdo-c8b2dd559e7dcbc28bb1f8b3e9623d7a42165bea.tar.gz
cdo-c8b2dd559e7dcbc28bb1f8b3e9623d7a42165bea.tar.xz
cdo-c8b2dd559e7dcbc28bb1f8b3e9623d7a42165bea.zip
Fixed NPE in titlesetter
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.windowtitle/src/org/eclipse/emf/cdo/releng/windowtitle/TitleSetter.java25
1 files changed, 18 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.windowtitle/src/org/eclipse/emf/cdo/releng/windowtitle/TitleSetter.java b/plugins/org.eclipse.emf.cdo.releng.windowtitle/src/org/eclipse/emf/cdo/releng/windowtitle/TitleSetter.java
index 712de0d710..54195da667 100644
--- a/plugins/org.eclipse.emf.cdo.releng.windowtitle/src/org/eclipse/emf/cdo/releng/windowtitle/TitleSetter.java
+++ b/plugins/org.eclipse.emf.cdo.releng.windowtitle/src/org/eclipse/emf/cdo/releng/windowtitle/TitleSetter.java
@@ -11,6 +11,7 @@
package org.eclipse.emf.cdo.releng.windowtitle;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
@@ -36,17 +37,27 @@ public class TitleSetter extends Thread
for (IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows())
{
final Shell shell = window.getShell();
- shell.getDisplay().asyncExec(new Runnable()
+ if (shell != null && !shell.isDisposed())
{
- public void run()
+ Display display = shell.getDisplay();
+ if (display != null && !display.isDisposed())
{
- String title = shell.getText();
- if (!title.startsWith(prefix))
+ display.asyncExec(new Runnable()
{
- shell.setText(prefix + title);
- }
+ public void run()
+ {
+ if (!shell.isDisposed())
+ {
+ String title = shell.getText();
+ if (!title.startsWith(prefix))
+ {
+ shell.setText(prefix + title);
+ }
+ }
+ }
+ });
}
- });
+ }
}
try

Back to the top