From 477fb92d41e9265914248cbef115a5281eca24be Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 24 Apr 2006 15:36:42 +0000 Subject: [PATCH] don't expose copyRemoteFileToWorkspace() since it doesn't store timestamps directly --- .../eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java | 6 +++--- .../files/ui/resources/UniversalFileTransferUtility.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java b/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java index 743274ad60d..e75899bc3bf 100644 --- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java +++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java @@ -167,8 +167,8 @@ public class RSEFileStoreRemoteFileWrapper extends FileStore implements IFileSto } if (file == null || !file.exists()) { - file = UniversalFileTransferUtility.copyRemoteFileToWorkspace(_remoteFile, monitor); - if (file != null) + file = (IFile)UniversalFileTransferUtility.copyRemoteResourceToWorkspace(_remoteFile, monitor); + if (file != null && !file.isSynchronized(IResource.DEPTH_ZERO)) { file.getProject().refreshLocal(IResource.DEPTH_INFINITE, monitor); } @@ -318,7 +318,7 @@ public class RSEFileStoreRemoteFileWrapper extends FileStore implements IFileSto if (_remoteFile.isFile() && _subSystem.isConnected()) { - file = UniversalFileTransferUtility.copyRemoteFileToWorkspace(_remoteFile, monitor); + file = (IResource)UniversalFileTransferUtility.copyRemoteResourceToWorkspace(_remoteFile, monitor); } else { 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 9991a288c07..736533a1a1e 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 @@ -94,7 +94,7 @@ public class UniversalFileTransferUtility * @param shell * @return the resulting local replica */ - public static IFile copyRemoteFileToWorkspace(IRemoteFile srcFileOrFolder, IProgressMonitor monitor) + protected static IFile copyRemoteFileToWorkspace(IRemoteFile srcFileOrFolder, IProgressMonitor monitor) { IRemoteFileSubSystem srcFS = srcFileOrFolder.getParentRemoteFileSubSystem(); IResource tempResource = getTempFileFor(srcFileOrFolder);