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

[187342] Xuan's patch for Adding connect() call after promptForPassword

Browse source
This commit is contained in:
David McKnight 2007-06-01 19:31:21 +00:00
parent cf8cde06e6
commit f782738bf8
1 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Martin Oberhuber (Wind River) - [187218] Fix error reporting for connect() * Martin Oberhuber (Wind River) - [187218] Fix error reporting for connect()
* Xuan Chen (IBM) - [187342] Open in New Window expand failed error when not connected
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.core.subsystems; package org.eclipse.rse.core.subsystems;
@ -2023,11 +2024,21 @@ public abstract class SubSystem extends RSEModelObject
*/ */
public Object[] resolveFilterString(String filterString, IProgressMonitor monitor) throws Exception public Object[] resolveFilterString(String filterString, IProgressMonitor monitor) throws Exception
{ {
boolean connnectedBefore = isConnected();
boolean ok = true; boolean ok = true;
if (!isConnected())
ok = promptForPassword(); if (!connnectedBefore)
ok = promptForPassword();
if (ok) if (ok)
{ {
if (!connnectedBefore)
{
getConnectorService().connect(monitor);
// disconnected but may not have notified viewers (i.e. network problem)
ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.connectedStatusChange(this, true, false, false);
}
Object[] results = internalResolveFilterString(filterString, monitor); Object[] results = internalResolveFilterString(filterString, monitor);
if (sortResults && (results!=null)) if (sortResults && (results!=null))
results = sortResolvedFilterStringObjects(results); results = sortResolvedFilterStringObjects(results);
@ -2059,15 +2070,25 @@ public abstract class SubSystem extends RSEModelObject
public Object[] resolveFilterStrings(String[] filterStrings, IProgressMonitor monitor) public Object[] resolveFilterStrings(String[] filterStrings, IProgressMonitor monitor)
throws Exception throws Exception
{ {
boolean connnectedBefore = isConnected();
boolean ok = true; boolean ok = true;
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;
} }
if (!isConnected())
if (!connnectedBefore)
ok = promptForPassword(); ok = promptForPassword();
if (ok) if (ok)
{ {
if (!connnectedBefore)
{
getConnectorService().connect(monitor);
// disconnected but may not have notified viewers (i.e. network problem)
ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.connectedStatusChange(this, true, false, false);
}
Object[] results = internalResolveFilterStrings(filterStrings, monitor); Object[] results = internalResolveFilterStrings(filterStrings, monitor);
if (sortResults && (results!=null)) if (sortResults && (results!=null))
results = sortResolvedFilterStringObjects(results); results = sortResolvedFilterStringObjects(results);
@ -2114,12 +2135,21 @@ public abstract class SubSystem extends RSEModelObject
public Object[] resolveFilterString(Object parent, String filterString, IProgressMonitor monitor) public Object[] resolveFilterString(Object parent, String filterString, IProgressMonitor monitor)
throws Exception throws Exception
{ {
boolean connnectedBefore = isConnected();
boolean ok = true; boolean ok = true;
if (!isConnected())
ok = promptForPassword();
if (ok) if (!connnectedBefore)
{ ok = promptForPassword();
if (ok)
{
if (!connnectedBefore)
{
getConnectorService().connect(monitor);
// disconnected but may not have notified viewers (i.e. network problem)
ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.connectedStatusChange(this, true, false, false);
}
Object[] results= internalResolveFilterString(parent, filterString, monitor); Object[] results= internalResolveFilterString(parent, filterString, monitor);
if (sortResults && (results!=null)) if (sortResults && (results!=null))
results = sortResolvedFilterStringObjects(results); results = sortResolvedFilterStringObjects(results);