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

[311218] Content conflict dialog pops up when it should not

Browse source
This commit is contained in:
David McKnight 2010-06-23 14:05:18 +00:00
parent 15ef6c845c
commit fdd5f9a1c3
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
View file

@ -60,6 +60,7 @@
* David McKnight (IBM) - [234258] [dnd] Drag&Drop a folder silently ignores elements without permissions * David McKnight (IBM) - [234258] [dnd] Drag&Drop a folder silently ignores elements without permissions
* David McKnight (IBM) - [299140] Local Readonly file can't be copied/pasted twice * David McKnight (IBM) - [299140] Local Readonly file can't be copied/pasted twice
* David McKnight (IBM) - [298440] jar files in a directory can't be pasted to another system properly * David McKnight (IBM) - [298440] jar files in a directory can't be pasted to another system properly
* David McKnight (IBM) - [311218] Content conflict dialog pops up when it should not
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.files.ui.resources; package org.eclipse.rse.files.ui.resources;
@ -229,11 +230,16 @@ public class UniversalFileTransferUtility {
// changed encodings matter too // changed encodings matter too
String remoteEncoding = remoteFile.getEncoding(); String remoteEncoding = remoteFile.getEncoding();
String lastEncoding = properties.getEncoding(); String lastEncoding = properties.getEncoding();
boolean usedReadOnly = properties.getReadOnly();
boolean isReadOnly = !remoteFile.canWrite();
if (storedModifiedStamp == remoteModifiedStamp && if (storedModifiedStamp == remoteModifiedStamp &&
(usedBin == shouldUseBin) && usedBin == shouldUseBin &&
(remoteEncoding.equals(lastEncoding)) remoteEncoding.equals(lastEncoding) &&
) usedReadOnly == isReadOnly
{ ){
return true; return true;
} }
} }
@ -316,7 +322,7 @@ public class UniversalFileTransferUtility {
listener.addIgnoreFile(tempFile); listener.addIgnoreFile(tempFile);
String remoteEncoding = srcFileOrFolder.getEncoding(); String remoteEncoding = srcFileOrFolder.getEncoding();
srcFS.download(srcFileOrFolder, tempFile.getLocation().makeAbsolute().toOSString(), remoteEncoding, monitor); srcFS.download(srcFileOrFolder, tempFile.getLocation().makeAbsolute().toOSString(), remoteEncoding, monitor);
listener.removeIgnoreFile(tempFile);
if (!tempFile.exists() && !tempFile.isSynchronized(IResource.DEPTH_ZERO)) if (!tempFile.exists() && !tempFile.isSynchronized(IResource.DEPTH_ZERO))
{ {
// eclipse doesn't like this if the resource appears to be from another project // eclipse doesn't like this if the resource appears to be from another project
@ -332,10 +338,18 @@ public class UniversalFileTransferUtility {
} }
if (tempFile.exists()) if (tempFile.exists())
{ {
SystemIFileProperties properties = new SystemIFileProperties(tempFile);
// set the appropriate readonly flag // set the appropriate readonly flag
boolean readOnly = !srcFileOrFolder.canWrite(); boolean readOnly = !srcFileOrFolder.canWrite();
setReadOnly(tempFile, readOnly); setReadOnly(tempFile, readOnly);
// set file properties
properties.setRemoteFileTimeStamp(srcFileOrFolder.getLastModified());
properties.setDownloadFileTimeStamp(tempFile.getLocation().toFile().lastModified());
properties.setReadOnly(readOnly);
properties.setDirty(false);
if (remoteEncoding != null) if (remoteEncoding != null)
{ {
if (srcFileOrFolder.isBinary()) if (srcFileOrFolder.isBinary())
@ -352,7 +366,6 @@ public class UniversalFileTransferUtility {
else else
{ {
// using text mode so the char set needs to be local // using text mode so the char set needs to be local
SystemIFileProperties properties = new SystemIFileProperties(tempFile);
if (properties.getLocalEncoding() != null){ if (properties.getLocalEncoding() != null){
String localEncoding = properties.getLocalEncoding(); String localEncoding = properties.getLocalEncoding();
tempFile.setCharset(localEncoding, null); tempFile.setCharset(localEncoding, null);
@ -361,6 +374,7 @@ public class UniversalFileTransferUtility {
} }
} }
} }
listener.removeIgnoreFile(tempFile);
} }
catch (SystemOperationCancelledException soce) { catch (SystemOperationCancelledException soce) {
return null; return null;