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

[160353] avoid nested look in connect

Browse source
This commit is contained in:
David McKnight 2006-12-07 19:35:45 +00:00
parent 4a9fb5a754
commit a8d15bf226
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1579,9 +1579,11 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*/ */
public class ConnectJob extends SubSystemOperationJob public class ConnectJob extends SubSystemOperationJob
{ {
public ConnectJob() private SubSystem _ss;
public ConnectJob(SubSystem ss)
{ {
super(GenericMessages.RSESubSystemOperation_Connect_message); super(GenericMessages.RSESubSystemOperation_Connect_message);
_ss = ss;
} }
public void performOperation(IProgressMonitor mon) throws InterruptedException, Exception public void performOperation(IProgressMonitor mon) throws InterruptedException, Exception
@ -1594,6 +1596,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
if (!implicitConnect(true, mon, msg, totalWorkUnits)) throw new Exception(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_FAILED).makeSubstitution(getHostName()).getLevelOneText()); if (!implicitConnect(true, mon, msg, totalWorkUnits)) throw new Exception(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_FAILED).makeSubstitution(getHostName()).getLevelOneText());
internalConnect(mon); internalConnect(mon);
RSEUIPlugin.getTheSystemRegistry().connectedStatusChange(_ss, true, false);
} }
} }
@ -2551,12 +2555,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
//dwd ((ProgressMonitorDialog) runnableContext).setCancelable(true); //dwd ((ProgressMonitorDialog) runnableContext).setCancelable(true);
//dwd } //dwd }
getConnectorService().promptForPassword(forcePrompt); // prompt for userid and password getConnectorService().promptForPassword(forcePrompt); // prompt for userid and password
ConnectJob job = new ConnectJob(); ConnectJob job = new ConnectJob(this);
scheduleJob(job, null, shell != null); scheduleJob(job, null, false);
IStatus status = job.getResult();
if (status != null && status.isOK()) {
registry.connectedStatusChange(this, true, false);
}
} }
} }