mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 02:36:01 +02:00
Code Issues Wiki Activity

Bug 485789 - Add connection canceled message.

Browse source 
Change-Id: Ia0a6de9f40749269649e42beb77a374277721c8b
Signed-off-by: Greg Watson <g.watson@computer.org>
This commit is contained in:
Greg Watson 2016-01-13 14:57:44 -05:00
parent 881ca83b43
commit 775acd6898
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
View file

@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.jsch.core.IJSchService; import org.eclipse.jsch.core.IJSchService;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
@ -924,6 +925,8 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC
return session; return session;
} }
return null; return null;
} catch (OperationCanceledException e) {
throw new RemoteConnectionException(Messages.JSchConnection_0);
} catch (JSchException e) { } catch (JSchException e) {
throw new RemoteConnectionException(e.getMessage()); throw new RemoteConnectionException(e.getMessage());
} }

2
bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java
View file

@ -26,6 +26,8 @@ public class Messages extends NLS {
public static String GetInputStreamCommand_Receiving; public static String GetInputStreamCommand_Receiving;
public static String GetOutputStreamCommand_Sending; public static String GetOutputStreamCommand_Sending;
public static String JSchConnection_0;
public static String JSchConnection_Connection_was_cancelled; public static String JSchConnection_Connection_was_cancelled;
public static String JSchConnection_connectionNotOpen; public static String JSchConnection_connectionNotOpen;
public static String JSchConnection_Executing_command; public static String JSchConnection_Executing_command;

1
bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties
View file

@ -16,6 +16,7 @@ AuthInfo_Authentication_message=Authentication Message
ExecCommand_Exec_command=Executing command "{0}" ExecCommand_Exec_command=Executing command "{0}"
GetInputStreamCommand_Receiving=Receiving {0}: GetInputStreamCommand_Receiving=Receiving {0}:
GetOutputStreamCommand_Sending=Sending {0}: GetOutputStreamCommand_Sending=Sending {0}:
JSchConnection_0=Connection canceled by user
JSchConnection_Connection_was_cancelled=Connection was cancelled JSchConnection_Connection_was_cancelled=Connection was cancelled
JSchConnection_connectionNotOpen=Connection is not open JSchConnection_connectionNotOpen=Connection is not open
JSchConnection_Executing_command=Executing command "{0}" JSchConnection_Executing_command=Executing command "{0}"