From fee9bcda5c76503ad372ba0b68ebe5850570c8aa Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 8 Jul 2009 22:08:28 +0000 Subject: [PATCH] [281712] [dstore] Warning message is needed when disk is full --- .../org/eclipse/dstore/core/model/ByteStreamHandler.java | 8 +------- .../files/ui/resources/UniversalFileTransferUtility.java | 5 ++++- .../internal/services/dstore/files/DStoreFileService.java | 2 ++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java index 54f946f460d..52a2db7b029 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java @@ -13,6 +13,7 @@ * * Contributors: * David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability + * David McKnight (IBM) [281712] [dstore] Warning message is needed when disk is full *******************************************************************************/ package org.eclipse.dstore.core.model; @@ -178,8 +179,6 @@ public class ByteStreamHandler implements IByteStreamHandler { FileOutputStream outStream = new FileOutputStream(fileName, true); - try - { if (binary) { outStream.write(buffer, 0, size); @@ -191,11 +190,6 @@ public class ByteStreamHandler implements IByteStreamHandler byte[] convertedBytes = byteConverter.convertClientBytesToHostBytes(buffer, 0, size); outStream.write(convertedBytes, 0, convertedBytes.length); } - } - catch (Exception e) - { - _dataStore.trace(e); - } outStream.close(); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java index a5f3e0d745b..06320dbdfa2 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java @@ -56,6 +56,7 @@ * David McKnight (IBM) - [251136] Error copying local file to remote system when temp file is readonly * David McKnight (IBM) - [276103] Files with names in different cases are not handled properly * David McKnight (IBM) - [276534] Cache Conflict After Synchronization when Browsing Remote System with Case-Differentiated-Only Filenames + * David McKnight (IBM) - [281712] [dstore] Warning message is needed when disk is full *******************************************************************************/ package org.eclipse.rse.files.ui.resources; @@ -255,7 +256,7 @@ public class UniversalFileTransferUtility { boolean available = true; try { - tempFileAvailable(tempFile, srcFileOrFolder); + available = tempFileAvailable(tempFile, srcFileOrFolder); } catch (RemoteFileIOException e){ // this is the case where a temp file exists for a file of a different case @@ -1990,10 +1991,12 @@ public class UniversalFileTransferUtility { catch (RemoteFileIOException e) { + SystemMessageDialog.displayMessage(e); return e.getSystemMessage(); } catch (SystemMessageException e) { + SystemMessageDialog.displayMessage(e); return e.getSystemMessage(); } } diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java index 831a69fd836..7f32516da41 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java @@ -58,6 +58,7 @@ * David McKnight (IBM) - [278411] [dstore] upload status needs to be created in standard form when using windows server * David McKnight (IBM) - [279014] [dstore][encoding] text file corruption can occur when downloading from UTF8 to cp1252 * David McKnight (IBM) - [279695] [dstore] Connection file encoding is not refreshed from the host + * David McKnight (IBM) - [281712] [dstore] Warning message is needed when disk is full *******************************************************************************/ package org.eclipse.rse.internal.services.dstore.files; @@ -562,6 +563,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer // upload bytes while available while (available > 0 && !isCancelled) { + result.setAttribute(DE.A_SOURCE, "working"); //$NON-NLS-1$ numToRead = (available < buffer_size) ? available : buffer_size;