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

minor fix - need to check if encodings have changed before knowning it th ecached file should be used

Browse source
This commit is contained in:
David McKnight 2007-11-23 20:37:08 +00:00
parent abb8421491
commit 773d10b1d9
4 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemEditFileAction.java
View file

@ -117,10 +117,20 @@ public class SystemEditFileAction extends SystemBaseAction {
boolean remoteNewer = (storedModifiedStamp != remoteModifiedStamp);
String encoding = remoteFile.getEncoding();
String remoteEncoding = remoteFile.getEncoding();
String storedEncoding = properties.getEncoding();
return (!dirty && !remoteNewer && (encoding != null && encoding.equals(storedEncoding)));
boolean encodingChanged = storedEncoding == null || !(remoteEncoding.equals(storedEncoding));
boolean usedBinary = properties.getUsedBinaryTransfer();
boolean isBinary = remoteFile.isBinary();
return (!dirty &&
!remoteNewer &&
usedBinary == isBinary &&
!encodingChanged);
}
return false;
}

10
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemEditFilesAction.java
View file

@ -142,7 +142,15 @@ public class SystemEditFilesAction extends SystemBaseAction {
String storedEncoding = properties.getEncoding();
boolean encodingChanged = storedEncoding == null || !(remoteEncoding.equals(storedEncoding));
return (!dirty && !remoteNewer && !encodingChanged);
boolean usedBinary = properties.getUsedBinaryTransfer();
boolean isBinary = remoteFile.isBinary();
return (!dirty &&
!remoteNewer &&
usedBinary == isBinary &&
!encodingChanged);
}
return false;
}

14
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileOpenWithMenu.java
View file

@ -248,7 +248,19 @@ private boolean isFileCached(ISystemEditableRemoteObject editable, IRemoteFile r
boolean dirty = properties.getDirty();
boolean remoteNewer = (storedModifiedStamp != remoteModifiedStamp);
return (!dirty && !remoteNewer);
String remoteEncoding = remoteFile.getEncoding();
String storedEncoding = properties.getEncoding();
boolean encodingChanged = storedEncoding == null || !(remoteEncoding.equals(storedEncoding));
boolean usedBinary = properties.getUsedBinaryTransfer();
boolean isBinary = remoteFile.isBinary();
return (!dirty &&
!remoteNewer &&
usedBinary == isBinary &&
!encodingChanged);
}
return false;
}

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

@ -3045,7 +3045,14 @@ public class SystemViewRemoteFileAdapter
String storedEncoding = properties.getEncoding();
boolean encodingChanged = storedEncoding == null || !(remoteEncoding.equals(storedEncoding));
return (!dirty && !remoteNewer && !encodingChanged);
boolean usedBinary = properties.getUsedBinaryTransfer();
boolean isBinary = remoteFile.isBinary();
return (!dirty &&
!remoteNewer &&
usedBinary == isBinary &&
!encodingChanged);
}
return false;
}