aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2010-07-25 15:48:34 +0000
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2010-07-25 15:48:34 +0000
commit17a69a6954e814b1b8a136a5d741a2182c230baf (patch)
treeec96f8947a98fd7230be0489669cb831fe3900ab /src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java
parent37b03cd101eefb17694f39a625bacb909eecb3cb (diff)
downloadjitsi-17a69a6954e814b1b8a136a5d741a2182c230baf.zip
jitsi-17a69a6954e814b1b8a136a5d741a2182c230baf.tar.gz
jitsi-17a69a6954e814b1b8a136a5d741a2182c230baf.tar.bz2
Fixes a few warnings. Removes a seemingly-unnecessary field.
Diffstat (limited to 'src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java34
1 files changed, 15 insertions, 19 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java
index 1c5e81f..65e9c7e 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java
@@ -13,13 +13,13 @@ package net.java.sip.communicator.impl.protocol.ssh;
import java.io.*;
-import com.jcraft.jsch.*;
-
+import net.java.sip.communicator.service.gui.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.util.Logger;
+import com.jcraft.jsch.*;
+
/**
- *
* @author Shobhit Jindal
*/
public class SSHFileTransferDaemon
@@ -246,21 +246,16 @@ public class SSHFileTransferDaemon
opSetPersPresence.changeContactPresenceStatus(
sshContact,
oldStatus);
-
}
/**
* Check for error in reading stream of remote machine
*
- * @return 0 for success
- * @return 1 for error
- * @return 2 for fatal error
- * @return -1 otherwise
- *
+ * @return 0 for success, 1 for error, 2 for fatal error, -1 otherwise
* @throws IOException when the network goes down
*/
private int checkAck(InputStream inputStream)
- throws IOException
+ throws IOException
{
int result = inputStream.read();
@@ -278,12 +273,16 @@ public class SSHFileTransferDaemon
buffer.append((char)ch);
}while(ch != '\n');
-
- ppService.getUIService().getPopupDialog().showMessagePopupDialog(
- buffer.toString(),
- "File Transfer Error: " + sshContact.getDisplayName(),
- ppService.getUIService().getPopupDialog().ERROR_MESSAGE);
-
+
+ ProtocolProviderServiceSSHImpl
+ .getUIService()
+ .getPopupDialog()
+ .showMessagePopupDialog(
+ buffer.toString(),
+ "File Transfer Error: "
+ + sshContact.getDisplayName(),
+ PopupDialog.ERROR_MESSAGE);
+
logger.error(buffer.toString());
}
@@ -458,8 +457,5 @@ public class SSHFileTransferDaemon
instantMessaging.createMessage(
this.file.getName() + " downloaded from Server"),
sshContact);
-
-
}
-
}