Commit f37d9af2 authored by 王业明's avatar 王业明
Browse files

Fix:SFtp上传功能修复

parent b4305d80
...@@ -159,7 +159,7 @@ public class FtpUploadJob extends Job implements IJobChangeListener { ...@@ -159,7 +159,7 @@ public class FtpUploadJob extends Job implements IJobChangeListener {
} catch (Exception e) { } catch (Exception e) {
if (status == Status.OK_STATUS) if (status == Status.OK_STATUS)
status = new Status(Status.ERROR, FtpActivator.PLUGIN_ID, status = new Status(IStatus.ERROR, FtpActivator.PLUGIN_ID,
FtpActivator.getPluginResource().getString(FtpConstants.FTP_I18N_J_D_E_UP_F) + "\n" FtpActivator.getPluginResource().getString(FtpConstants.FTP_I18N_J_D_E_UP_F) + "\n"
+ e.getMessage()); + e.getMessage());
else else
......
...@@ -6,11 +6,7 @@ import cn.com.bankit.ide.common.ftp.SSHRemoteCall; ...@@ -6,11 +6,7 @@ import cn.com.bankit.ide.common.ftp.SSHRemoteCall;
import cn.com.bankit.ide.common.ftp.console.ConsoleFactory; import cn.com.bankit.ide.common.ftp.console.ConsoleFactory;
import cn.com.bankit.ide.common.ftp.model.ConnNode; import cn.com.bankit.ide.common.ftp.model.ConnNode;
import cn.com.bankit.ide.common.ftp.model.UploadModel; import cn.com.bankit.ide.common.ftp.model.UploadModel;
import cn.com.bankit.ide.common.resources.ResourceProvider;
import java.io.File;
import java.util.List; import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
public class SFtpUploadJob extends FtpUploadJob { public class SFtpUploadJob extends FtpUploadJob {
...@@ -23,6 +19,7 @@ public class SFtpUploadJob extends FtpUploadJob { ...@@ -23,6 +19,7 @@ public class SFtpUploadJob extends FtpUploadJob {
ConsoleFactory.regist(connNode); ConsoleFactory.regist(connNode);
} }
@Override
protected void doRun(IProgressMonitor monitor) throws Exception { protected void doRun(IProgressMonitor monitor) throws Exception {
uploadFile(monitor); uploadFile(monitor);
} }
...@@ -36,7 +33,7 @@ public class SFtpUploadJob extends FtpUploadJob { ...@@ -36,7 +33,7 @@ public class SFtpUploadJob extends FtpUploadJob {
this.total = this.list.size(); this.total = this.list.size();
label244: for (UploadModel up : this.list) for (UploadModel up : this.list)
try { try {
monitor.beginTask( monitor.beginTask(
FtpActivator.getPluginResource() FtpActivator.getPluginResource()
...@@ -51,9 +48,11 @@ public class SFtpUploadJob extends FtpUploadJob { ...@@ -51,9 +48,11 @@ public class SFtpUploadJob extends FtpUploadJob {
this.connNode.setConsoleMessage("文件 " + up.getLocalJavaFile().getAbsolutePath() + "上传到 " this.connNode.setConsoleMessage("文件 " + up.getLocalJavaFile().getAbsolutePath() + "上传到 "
+ this.ssh.getHome() + up.getRemotePath() + "成功"); + this.ssh.getHome() + up.getRemotePath() + "成功");
} }
if (!(monitor.isCanceled())) System.out.println("monitor.isCanceled(): " + monitor.isCanceled());
break label244; if (monitor.isCanceled()){
return; break;
}
//return;
} catch (Exception e) { } catch (Exception e) {
this.connNode.setConsoleError(e.getMessage()); this.connNode.setConsoleError(e.getMessage());
throw e; throw e;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment