mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-23 08:13:50 +02:00
Code Issues Wiki Activity

partial fix for Bug 162688 - use NullProgressMonitor instead of null

Browse source
This commit is contained in:
David McKnight 2006-11-02 17:51:10 +00:00
parent 593a240622
commit 7d1d41c300
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java
View file

@ -17,6 +17,7 @@
package org.eclipse.rse.files.ui.actions; package org.eclipse.rse.files.ui.actions;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.window.Window; import org.eclipse.jface.window.Window;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.files.ui.FileResources; 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 // and user wants to overwrite the remote file with pending changes
try try
{ {
fs.uploadUTF8(_tempFile, _remoteFile, null); fs.uploadUTF8(_tempFile, _remoteFile, new NullProgressMonitor());
_remoteFile.markStale(true); _remoteFile.markStale(true);
_remoteFile = fs.getRemoteFileObject(_remoteFile.getAbsolutePath()); _remoteFile = fs.getRemoteFileObject(_remoteFile.getAbsolutePath());
properties.setRemoteFileTimeStamp(_remoteFile.getLastModified()); properties.setRemoteFileTimeStamp(_remoteFile.getLastModified());
@ -465,7 +466,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
try try
{ {
// download remote version // download remote version
fs.downloadUTF8(_remoteFile, _tempFile, null); fs.downloadUTF8(_remoteFile, _tempFile, new NullProgressMonitor());
properties.setRemoteFileTimeStamp(_remoteFile.getLastModified()); properties.setRemoteFileTimeStamp(_remoteFile.getLastModified());
//properties.setRemoteFileTimeStamp(-1); //properties.setRemoteFileTimeStamp(-1);