diff options
| author | slewis | 2007-08-14 21:23:41 +0000 |
|---|---|---|
| committer | slewis | 2007-08-14 21:23:41 +0000 |
| commit | e109d97eaf0c792e17c12e5c2f77eee4d56ba2b2 (patch) | |
| tree | b2d0eb9b7210efeea0b7be056893a4abc0139c4d /providers/bundles/org.eclipse.ecf.provider.filetransfer | |
| parent | a1467772fd483a432190a0346bc6991ba50db181 (diff) | |
| download | org.eclipse.ecf-e109d97eaf0c792e17c12e5c2f77eee4d56ba2b2.tar.gz org.eclipse.ecf-e109d97eaf0c792e17c12e5c2f77eee4d56ba2b2.tar.xz org.eclipse.ecf-e109d97eaf0c792e17c12e5c2f77eee4d56ba2b2.zip | |
Fix for bug 199951
Diffstat (limited to 'providers/bundles/org.eclipse.ecf.provider.filetransfer')
| -rw-r--r-- | providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java index b146e2ef4..0d740b795 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java @@ -38,8 +38,7 @@ import org.eclipse.ecf.provider.filetransfer.identity.FileTransferNamespace; import org.eclipse.osgi.util.NLS; public abstract class AbstractRetrieveFileTransfer implements - IIncomingFileTransfer, IRetrieveFileTransfer, - IFileTransferPausable { + IIncomingFileTransfer, IRetrieveFileTransfer, IFileTransferPausable { public static final int DEFAULT_BUF_LENGTH = 4096; @@ -142,18 +141,27 @@ public abstract class AbstractRetrieveFileTransfer implements } protected IStatus getFinalStatus(Throwable exception) { - return (exception == null) ? new Status( - IStatus.OK, - Activator.getDefault().getBundle().getSymbolicName(), - 0, - Messages.AbstractRetrieveFileTransfer_Status_Transfer_Completed_OK, - null) - : new Status( - IStatus.CANCEL, - Activator.PLUGIN_ID, - FILETRANSFER_ERRORCODE, - Messages.AbstractRetrieveFileTransfer_Status_Transfer_Exception, - exception); + if (exception == null) + return new Status( + IStatus.OK, + Activator.getDefault().getBundle().getSymbolicName(), + 0, + Messages.AbstractRetrieveFileTransfer_Status_Transfer_Completed_OK, + null); + else if (exception instanceof UserCancelledException) + return new Status( + IStatus.CANCEL, + Activator.PLUGIN_ID, + FILETRANSFER_ERRORCODE, + Messages.AbstractRetrieveFileTransfer_Exception_User_Cancelled, + exception); + else + return new Status( + IStatus.ERROR, + Activator.PLUGIN_ID, + FILETRANSFER_ERRORCODE, + Messages.AbstractRetrieveFileTransfer_Status_Transfer_Exception, + exception); } protected void hardClose() { |