Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2010-12-14 05:32:55 -0500
committerTomasz Zarna2010-12-14 05:32:55 -0500
commitb0eb71570f385549365478e07f865a860918a1ac (patch)
treefb9fc729528ab332e09f6ac689ec043c1cc935ed
parent2017e577b2985c89d395280f2ac3f30fb9eb0d86 (diff)
downloadeclipse.platform.team-b0eb71570f385549365478e07f865a860918a1ac.tar.gz
eclipse.platform.team-b0eb71570f385549365478e07f865a860918a1ac.tar.xz
eclipse.platform.team-b0eb71570f385549365478e07f865a860918a1ac.zip
bug 332049: Invalid thread access comparing to HEAD
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
index 9466fb2fc..3b16e35b0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
@@ -399,17 +399,18 @@ public class TeamUIPlugin extends AbstractUIPlugin {
}
/**
- * Returns the standard display to be used. The method first checks, if
- * the thread calling this method has an associated display. If so, this
- * display is returned. Otherwise the method returns the default display.
+ * Returns the standard display to be used. The method first checks, if the
+ * thread calling this method has an associated display. If so, this display
+ * is returned. Otherwise the method returns the display for this workbench.
+ *
* @return the standard display to be used
*/
public static Display getStandardDisplay() {
- Display display= Display.getCurrent();
+ Display display = Display.getCurrent();
if (display == null) {
- display= Display.getDefault();
+ display = PlatformUI.getWorkbench().getDisplay();
}
- return display;
+ return display;
}
public Image getImage(String key) {

Back to the top