Bug 75801 All workbench windows blockedI20041215

1 files changed, 5 insertions, 16 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java
index 1adcdb3ed..832f997bb 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java
@@ -290,23 +290,12 @@ public class Utils {
 	}
 
 	public static Shell findShell() {
-	    // First find the active shell of the display and use it.
-	    // We need to do this since the active shell may be model
-	    // in which case we nned to parent off that or risk deadlock
-		Display display= Display.getCurrent();
-		if (display == null) {
-			display= Display.getDefault();
-		}
-		if (display != null) {
-			return display.getActiveShell();
-		}
-		// Try to use the active window (although I suspect this will fail if the bove failed)
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if(window != null) {
-			return window.getShell();
-		}
+		Display display = TeamUIPlugin.getStandardDisplay();
+		Shell activeShell = display.getActiveShell();
+		if (activeShell != null)
+			return activeShell;
 		// worst case, just create our own.
-		return new Shell(TeamUIPlugin.getStandardDisplay());	
+		return new Shell(display);
 	}
 	
 	public static IWorkbenchPartSite findSite(Control c) {