mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-20 06:35:50 +02:00
Code Issues Wiki Activity

handle cancel connect when launching shell - Bug 158869

Browse source
This commit is contained in:
David McKnight 2006-10-03 17:36:25 +00:00
parent 3e83efc143
commit 87a2136876
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/actions/SystemCommandAction.java
View file

@ -489,10 +489,13 @@ public class SystemCommandAction extends SystemBaseAction
else else
{ {
cmdSubSystem.connect(); cmdSubSystem.connect();
SystemCommandsUI commandsUI = SystemCommandsUI.getInstance(); if (cmdSubSystem.isConnected())
SystemCommandsViewPart cmdsPart = commandsUI.activateCommandsView(); {
IRemoteCommandShell cmd = cmdSubSystem.runShell( _selected); SystemCommandsUI commandsUI = SystemCommandsUI.getInstance();
cmdsPart.updateOutput(cmd); SystemCommandsViewPart cmdsPart = commandsUI.activateCommandsView();
IRemoteCommandShell cmd = cmdSubSystem.runShell( _selected);
cmdsPart.updateOutput(cmd);
}
//showInView(cmd); //showInView(cmd);
} }
} }

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

@ -196,8 +196,14 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
{ {
connect(false); connect(false);
} }
catch (InterruptedException e)
{
return Status.CANCEL_STATUS;
}
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace();
String excMsg = e.getMessage(); String excMsg = e.getMessage();
if ((excMsg == null) || (excMsg.length()==0)) if ((excMsg == null) || (excMsg.length()==0))
excMsg = "Exception " + e.getClass().getName(); excMsg = "Exception " + e.getClass().getName();