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

[210816] fix: Archive testcases throw ResourceException if they are run in batch

Browse source
This commit is contained in:
Xuan Chen 2008-01-02 15:22:17 +00:00
parent 66d9007048
commit 97b069a9ec
2 changed files with 18 additions and 0 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/resources/SystemEditableRemoteFile.java
View file

@ -23,6 +23,7 @@
* David McKnight (IBM) - [186363] get rid of obsolete calls to ISubSystem.connect() * David McKnight (IBM) - [186363] get rid of obsolete calls to ISubSystem.connect()
* David McKnight (IBM) - [209660] check for changed encoding before using cached file * David McKnight (IBM) - [209660] check for changed encoding before using cached file
* David McKnight (IBM) - [210812] for text transfer, need to tell editor to use local encoding * David McKnight (IBM) - [210812] for text transfer, need to tell editor to use local encoding
* Xuan Chen (IBM) - [210816] Archive testcases throw ResourceException if they are run in batch
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.files.ui.resources; package org.eclipse.rse.files.ui.resources;
@ -1484,6 +1485,10 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
if (encoding != null) if (encoding != null)
{ {
if (remoteFile.isBinary()){ if (remoteFile.isBinary()){
if (!file.isSynchronized(IResource.DEPTH_ZERO))
{
file.refreshLocal(IResource.DEPTH_ZERO, null/*monitor*/);
}
if (!file.getCharset().equals(encoding)) if (!file.getCharset().equals(encoding))
{ {
file.setCharset(encoding, null); file.setCharset(encoding, null);

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

@ -38,6 +38,7 @@
* David McKnight (IBM) - [209552] get rid of copy APIs to be clearer with download and upload * David McKnight (IBM) - [209552] get rid of copy APIs to be clearer with download and upload
* David McKnight (IBM) - [143503] encoding and isBinary needs to be stored in the IFile properties * David McKnight (IBM) - [143503] encoding and isBinary needs to be stored in the IFile properties
* Xuan Chen (IBM) - [191370] [dstore] Supertransfer zip not deleted when cancelling copy * Xuan Chen (IBM) - [191370] [dstore] Supertransfer zip not deleted when cancelling copy
* Xuan Chen (IBM) - [210816] Archive testcases throw ResourceException if they are run in batch
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.files.ui.resources; package org.eclipse.rse.files.ui.resources;
@ -246,6 +247,10 @@ public class UniversalFileTransferUtility
{ {
try try
{ {
if (!tempFile.isSynchronized(IResource.DEPTH_ZERO))
{
tempFile.refreshLocal(IResource.DEPTH_ZERO, null/*monitor*/);
}
String cset = tempFile.getCharset(); String cset = tempFile.getCharset();
if (!cset.equals(remoteEncoding)) if (!cset.equals(remoteEncoding))
{ {
@ -517,6 +522,10 @@ public class UniversalFileTransferUtility
{ {
try try
{ {
if (!tempFile.isSynchronized(IResource.DEPTH_ZERO))
{
tempFile.refreshLocal(IResource.DEPTH_ZERO, null/*monitor*/);
}
String cset = tempFile.getCharset(); String cset = tempFile.getCharset();
if (!cset.equals(remoteEncoding)) if (!cset.equals(remoteEncoding))
{ {
@ -843,6 +852,10 @@ public class UniversalFileTransferUtility
{ {
try try
{ {
if (!tempFile.isSynchronized(IResource.DEPTH_ZERO))
{
tempFile.refreshLocal(IResource.DEPTH_ZERO, null/*monitor*/);
}
String cset = tempFile.getCharset(); String cset = tempFile.getCharset();
if (!cset.equals(encoding)) if (!cset.equals(encoding))
{ {