mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 20:45:22 +02:00
Code Issues Wiki Activity

[254769] Don't get latest file when opening a file always

Browse source
This commit is contained in:
David McKnight 2009-01-26 20:35:57 +00:00
parent a921481a0b
commit 9dee00533d
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
View file

@ -59,6 +59,7 @@
* Martin Oberhuber (Wind River) - [234215] improve API documentation for doDelete and doDeleteBatch * Martin Oberhuber (Wind River) - [234215] improve API documentation for doDelete and doDeleteBatch
* David McKnight (IBM) - [251860] Rename a file/folder to a hidden file causes problems * David McKnight (IBM) - [251860] Rename a file/folder to a hidden file causes problems
* David McKnight (IBM) - [261019] New File/Folder actions available in Work Offline mode * David McKnight (IBM) - [261019] New File/Folder actions available in Work Offline mode
* David McKnight (IBM) - [254769] Don't get latest file when opening a file always
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.files.ui.view; package org.eclipse.rse.internal.files.ui.view;
@ -3263,6 +3264,13 @@ public class SystemViewRemoteFileAdapter
*/ */
else if (!remoteFile.isArchive() || !remoteFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement()) else if (!remoteFile.isArchive() || !remoteFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement())
{ {
// make sure we're using the latest version of remoteFile
try {
remoteFile = remoteFile.getParentRemoteFileSubSystem().getRemoteFileObject(remoteFile.getAbsolutePath(), new NullProgressMonitor());
}
catch (Exception e){
}
// only handle double click if object is a file // only handle double click if object is a file
ISystemEditableRemoteObject editable = getEditableRemoteObject(remoteFile); ISystemEditableRemoteObject editable = getEditableRemoteObject(remoteFile);
if (editable != null) if (editable != null)
@ -3316,17 +3324,18 @@ public class SystemViewRemoteFileAdapter
boolean newFile = !file.exists(); boolean newFile = !file.exists();
// detect whether there exists a temp copy already // detect whether there exists a temp copy already
if (!newFile && file.exists()) if (!newFile)
{ {
// we have a local copy of this file, so we need to compare timestamps // we have a local copy of this file, so we need to compare timestamps
// get stored modification stamp // get stored modification stamp
long storedModifiedStamp = properties.getRemoteFileTimeStamp(); long storedModifiedStamp = properties.getRemoteFileTimeStamp();
long oldRemoteModifiedStamp = remoteFile.getLastModified();
// get updated remoteFile so we get the current remote timestamp // get updated remoteFile so we get the current remote timestamp
//remoteFile.markStale(true);
IRemoteFileSubSystem subsystem = remoteFile.getParentRemoteFileSubSystem(); IRemoteFileSubSystem subsystem = remoteFile.getParentRemoteFileSubSystem();
if (!subsystem.isOffline()){ // only do this check when online..if offline we assume the temp file is okay if (!subsystem.isOffline()){ // only do this check when online..if offline we assume the temp file is okay
remoteFile.markStale(true);
try try
{ {
remoteFile = subsystem.getRemoteFileObject(remoteFile.getAbsolutePath(), new NullProgressMonitor()); remoteFile = subsystem.getRemoteFileObject(remoteFile.getAbsolutePath(), new NullProgressMonitor());
@ -3334,6 +3343,9 @@ public class SystemViewRemoteFileAdapter
catch (Exception e) catch (Exception e)
{ {
} }
// make sure that the editable is using an uptodate version
((SystemEditableRemoteFile)editable).setRemoteFile(remoteFile);
} }
// get the remote modified stamp // get the remote modified stamp
@ -3342,7 +3354,7 @@ public class SystemViewRemoteFileAdapter
// get dirty flag // get dirty flag
boolean dirty = properties.getDirty(); boolean dirty = properties.getDirty();
boolean remoteNewer = (storedModifiedStamp != remoteModifiedStamp); boolean remoteNewer = (oldRemoteModifiedStamp != remoteModifiedStamp) || (storedModifiedStamp != remoteModifiedStamp);
String remoteEncoding = remoteFile.getEncoding(); String remoteEncoding = remoteFile.getEncoding();
String storedEncoding = properties.getEncoding(); String storedEncoding = properties.getEncoding();