From d6b97765f8ed816e7d10d5d5ee403f5653337bf7 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 24 May 2006 20:28:10 +0000 Subject: [PATCH] better transfer message --- .../rse/services/dstore/files/DStoreFileService.java | 9 ++++----- .../UI/org/eclipse/rse/ui/GenericMessages.java | 2 +- .../UI/org/eclipse/rse/ui/GenericMessages.properties | 2 +- .../eclipse/rse/ui/view/SystemDNDTransferRunnable.java | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java index 9b2523a91c5..1e38b76c5fa 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java @@ -365,14 +365,13 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer IHostFile created = createFile(monitor, remoteParent, remoteFile); return created.exists(); } - /* - SubProgressMonitor subMonitor = null; + if (monitor != null) { - monitor.subTask(file.getName()); - subMonitor = new SubProgressMonitor(monitor, (int)totalBytes); + monitor.setTaskName(file.getName()); + //subMonitor = new SubProgressMonitor(monitor, (int)totalBytes); } - */ + DataElement uploadLog = findUploadLog(); // listener = new FileTransferStatusListener(remotePath, shell, monitor, getConnectorService(), ds, uploadLog); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/GenericMessages.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/GenericMessages.java index 404642dcf0e..facc19c24ed 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/GenericMessages.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/GenericMessages.java @@ -32,7 +32,7 @@ public class GenericMessages extends NLS public static String RefreshAction_locationDeletedMessage; public static String RefreshAction_dialogTitle; - public static String DragAndDropOperation_message; + public static String TransferOperation_message; public static String RSESubSystemOperation_message; public static String RSESubSystemOperation_Connect_message; public static String RSESubSystemOperation_Disconnect_message; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/GenericMessages.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/GenericMessages.properties index 91a8ac122e0..63c5a50b553 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/GenericMessages.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/GenericMessages.properties @@ -40,7 +40,7 @@ FileExtension_extensionEmptyMessage = The file extension cannot be empty FileExtension_fileNameInvalidMessage = The file name cannot include the wild card character (*) in the current location FilteredPreferenceDialog_PreferenceSaveFailed=Preferences save failed. -DragAndDropOperation_message = Drag and Drop Operation +TransferOperation_message = Transfer Operation RSESubSystemOperation_message = RSE SubSystem Operation: RSESubSystemOperation_Connect_message = Connect RSESubSystemOperation_Disconnect_message = Disconnect diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java index 66e5daa8771..508ceafd649 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java @@ -72,7 +72,7 @@ public class SystemDNDTransferRunnable extends UIJob public SystemDNDTransferRunnable(Object target, ArrayList srcObjects, Viewer originatingViewer, int sourceType) { - super(GenericMessages.DragAndDropOperation_message); + super(GenericMessages.TransferOperation_message); _srcObjects = srcObjects; _currentTarget = target; _sourceType = sourceType;