From 786ad2e2283cf783c4b7e8fb5e0f229129d7ca4e Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 24 Oct 2007 13:54:50 +0000 Subject: [PATCH] [186363] remove deprecated calls in checkIsConnected --- .../org/eclipse/rse/core/subsystems/SubSystem.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index 146d2ac7395..7799fe81645 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -24,6 +24,7 @@ * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [187218] Fix error reporting for connect() * Xuan Chen (IBM) - [187342] Open in New Window expand failed error when not connected + * David McKnight (IBM) - [186363] remove deprecated calls in checkIsConnected ********************************************************************************/ package org.eclipse.rse.core.subsystems; @@ -484,21 +485,12 @@ public abstract class SubSystem extends RSEModelObject Display display = Display.getCurrent(); if (display != null) { - // deduce active shell from display - Shell shell = display.getActiveShell(); - if (shell != null && !shell.isDisposed()) - { - connect(); - } - else - { - connect(); - } + connect(false, null); } else { // Not on UI-thread - connect(); + connect(new NullProgressMonitor(), false); } } catch (Exception e)