mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

[189483] fix cancellation handling and notification for password prompting

Browse source
This commit is contained in:
David Dykstal 2007-06-02 15:02:51 +00:00
parent f26f632503
commit 23d43b4233
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java
View file

@ -14,6 +14,7 @@
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Martin Oberhuber (Wind River) - [189272] exception when canceling ssh connect
* David Dykstal (IBM) - [189483] add notification when canceling password prompting
********************************************************************************/
package org.eclipse.rse.ui.operations;
@ -30,7 +31,9 @@ import org.eclipse.jface.action.IAction;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.ISystemMessageObject;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.model.SystemMessageObject;
import org.eclipse.rse.core.subsystems.SubSystem;
import org.eclipse.rse.core.subsystems.SubSystem.DisplayErrorMessageJob;
import org.eclipse.rse.internal.ui.GenericMessages;
@ -105,6 +108,10 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW
monitor.setTaskName(getTaskName());
execute(Policy.subMonitorFor(monitor, 100));
endOperation();
} catch (InterruptedException e) { // operation was canceled
endOperation();
monitor.setCanceled(true);
throw e;
} catch (Exception e) {
// TODO: errors may not be empty (i.e. endOperation has not been executed)
throw new InvocationTargetException(e);
@ -127,6 +134,7 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW
public class PromptForPassword implements Runnable
{
public SubSystem _ss;
private boolean isCanceled = false;
public PromptForPassword(SubSystem ss)
{
_ss = ss;
@ -136,13 +144,21 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW
{
try
{
isCanceled = false;
_ss.promptForPassword();
}
catch (InterruptedException e) {
isCanceled = true;
}
catch (Exception e)
{
}
}
public boolean isCanceled() {
return isCanceled;
}
}
public class UpdateRegistry implements Runnable
@ -185,7 +201,14 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW
{
Display dis = Display.getDefault();
dis.syncExec(new PromptForPassword(ss));
PromptForPassword prompter = new PromptForPassword(ss);
dis.syncExec(prompter);
if (prompter.isCanceled()) {
SystemMessage canceledMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED);
SystemMessageObject canceledMessageObject = new SystemMessageObject(canceledMessage, ISystemMessageObject.MSGTYPE_CANCEL, _remoteObject);
_collector.add(canceledMessageObject, monitor);
throw new InterruptedException();
}
try
{
ss.getConnectorService().connect(monitor);