From fa9cb1307dd29bd878e7d9a8ae7bb10f53965632 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 3 Jun 2008 23:54:55 +0000 Subject: [PATCH] [233435] SubSystem.resolveFilterStrings(*) does not prompt for a connection when the subsystem is not connected --- .../org/eclipse/rse/core/subsystems/SubSystem.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 1f316b1596d..b2308602ffa 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 @@ -38,6 +38,7 @@ * Martin Oberhuber (Wind River) - [218304] Improve deferred adapter loading * Martin Oberhuber (Wind River) - [190231] Prepare API for UI/Non-UI Splitting * David McKnight (IBM) - [225747] [dstore] Trying to connect to an "Offline" system throws an NPE + * David McKnight (IBM) - [233435] SubSystem.resolveFilterStrings(*) does not prompt for a connection when the subsystem is not connected ********************************************************************************/ package org.eclipse.rse.core.subsystems; @@ -2177,7 +2178,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider */ public Object[] resolveFilterString(String filterString, IProgressMonitor monitor) throws Exception { - + // for bug 233435, implicit connect if the connection is not connected + checkIsConnected(monitor); + if (isConnected()) { if (!supportsConnecting && !_isInitialized) { @@ -2215,6 +2218,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider public Object[] resolveFilterStrings(String[] filterStrings, IProgressMonitor monitor) throws Exception { + // for bug 233435, implicit connect if the connection is not connected + checkIsConnected(monitor); + if ((filterStrings == null) || (filterStrings.length == 0)) { SystemBasePlugin.logInfo("Filter strings are null"); //$NON-NLS-1$ return null; @@ -2271,6 +2277,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider public Object[] resolveFilterString(Object parent, String filterString, IProgressMonitor monitor) throws Exception { + // for bug 233435, implicit connect if the connection is not connected + checkIsConnected(monitor); + if (isConnected()) { if (!supportsConnecting && !_isInitialized) {