From 843464fe695859d1480b70cfd9d1e54f4eb753be Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 23 Jan 2009 16:10:52 +0000 Subject: [PATCH] [262092] Special characters are missing when pasting a file on a different connection --- .../files/ui/resources/UniversalFileTransferUtility.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 78af09f1692..b0b08633545 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 @@ -50,6 +50,7 @@ * David McKnight (IBM) - [234924] [ftp][dnd][Refresh] Copy/Paste file from Package Explorer doesn't refresh folder * David McKnight (IBM) - [236723] UniversalFileTransferUtility..uploadResourcesFromWorkspace should query remote folder encoding * Radoslav Gerganov (ProSyst) - [231428] [files] NPE on canceling copy operation from remote host + * David McKnight (IBM) - [262092] Special characters are missing when pasting a file on a different connection ********************************************************************************/ package org.eclipse.rse.files.ui.resources; @@ -1585,8 +1586,8 @@ public class UniversalFileTransferUtility { { srcCharSet = ((IFile)srcFileOrFolder).getCharset(false); if (srcCharSet == null || srcCharSet.length() == 0) - { - srcCharSet = SystemEncodingUtil.ENCODING_UTF_8; + { + srcCharSet = srcFileOrFolder.getWorkspace().getRoot().getDefaultCharset(); } } catch (CoreException e) @@ -1809,7 +1810,7 @@ public class UniversalFileTransferUtility { srcCharSet = ((IFile)srcFileOrFolder).getCharset(false); if (srcCharSet == null || srcCharSet.length() == 0) { - srcCharSet = SystemEncodingUtil.ENCODING_UTF_8; + srcCharSet = srcFileOrFolder.getWorkspace().getRoot().getDefaultCharset(); } } catch (CoreException e)