mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 13:05:22 +02:00
Code Issues Wiki Activity

[233435] SubSystem.resolveFilterStrings(*) does not prompt for a connection when the subsystem is not connected

Browse source
This commit is contained in:
David McKnight 2008-06-03 23:54:55 +00:00
parent 9db32e3699
commit fa9cb1307d
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
View file

@ -38,6 +38,7 @@
* Martin Oberhuber (Wind River) - [218304] Improve deferred adapter loading * Martin Oberhuber (Wind River) - [218304] Improve deferred adapter loading
* Martin Oberhuber (Wind River) - [190231] Prepare API for UI/Non-UI Splitting * 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) - [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; package org.eclipse.rse.core.subsystems;
@ -2177,7 +2178,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
*/ */
public Object[] resolveFilterString(String filterString, IProgressMonitor monitor) throws Exception 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 (isConnected())
{ {
if (!supportsConnecting && !_isInitialized) { if (!supportsConnecting && !_isInitialized) {
@ -2215,6 +2218,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
public Object[] resolveFilterStrings(String[] filterStrings, IProgressMonitor monitor) public Object[] resolveFilterStrings(String[] filterStrings, IProgressMonitor monitor)
throws Exception throws Exception
{ {
// for bug 233435, implicit connect if the connection is not connected
checkIsConnected(monitor);
if ((filterStrings == null) || (filterStrings.length == 0)) { if ((filterStrings == null) || (filterStrings.length == 0)) {
SystemBasePlugin.logInfo("Filter strings are null"); //$NON-NLS-1$ SystemBasePlugin.logInfo("Filter strings are null"); //$NON-NLS-1$
return null; return null;
@ -2271,6 +2277,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
public Object[] resolveFilterString(Object parent, String filterString, IProgressMonitor monitor) public Object[] resolveFilterString(Object parent, String filterString, IProgressMonitor monitor)
throws Exception throws Exception
{ {
// for bug 233435, implicit connect if the connection is not connected
checkIsConnected(monitor);
if (isConnected()) if (isConnected())
{ {
if (!supportsConnecting && !_isInitialized) { if (!supportsConnecting && !_isInitialized) {