From 7d1d41c3007ac2b5255997c3716f393223ec4949 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 2 Nov 2006 17:51:10 +0000 Subject: [PATCH] partial fix for Bug 162688 - use NullProgressMonitor instead of null --- .../rse/files/ui/actions/SystemUploadConflictAction.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java index 6e4837f961b..170b67176c5 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java @@ -17,6 +17,7 @@ package org.eclipse.rse.files.ui.actions; import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.window.Window; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.files.ui.FileResources; @@ -443,7 +444,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn // and user wants to overwrite the remote file with pending changes try { - fs.uploadUTF8(_tempFile, _remoteFile, null); + fs.uploadUTF8(_tempFile, _remoteFile, new NullProgressMonitor()); _remoteFile.markStale(true); _remoteFile = fs.getRemoteFileObject(_remoteFile.getAbsolutePath()); properties.setRemoteFileTimeStamp(_remoteFile.getLastModified()); @@ -465,7 +466,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn try { // download remote version - fs.downloadUTF8(_remoteFile, _tempFile, null); + fs.downloadUTF8(_remoteFile, _tempFile, new NullProgressMonitor()); properties.setRemoteFileTimeStamp(_remoteFile.getLastModified()); //properties.setRemoteFileTimeStamp(-1);