Attachment 78177 Details for Bug 199773 – FileServiceSubSystem passing transfer mode from RSE Preferences

[patch] FileServiceSubSystem passing transfer mode from RSE Preferences

patch.txt (text/plain), 2.70 KB, created by Javier Montalvo Orús

on 2007-09-12 09:20:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Javier Montalvo Orús

Created: 2007-09-12 09:20:18 EDT

Size: 2.70 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.subsystems.files.core
>Index: src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java,v
>retrieving revision 1.41
>diff -u -r1.41 FileServiceSubSystem.java
>--- src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java	18 May 2007 00:53:52 -0000	1.41
>+++ src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java	12 Sep 2007 13:06:48 -0000
>@@ -32,6 +32,7 @@
> import org.eclipse.rse.core.subsystems.IConnectorService;
> import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration;
> import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
>+import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
> import org.eclipse.rse.services.clientserver.PathUtility;
> import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
> import org.eclipse.rse.services.clientserver.SystemSearchString;
>@@ -443,7 +444,7 @@
> 		}
> 		String parentPath = file.getParentPath();
> 		File localFile = new File(localpath);
>-		getFileService().download(parentPath, file.getName(), localFile, isBinary(file), file.getEncoding(), monitor);
>+		getFileService().download(parentPath, file.getName(), localFile, SystemFileTransferModeRegistry.getFileTransferModeDefaultPreference()==ISystemFilePreferencesConstants.FILETRANSFERMODE_BINARY, file.getEncoding(), monitor);
> 		if (monitor.isCanceled())
> 		{
> 			localFile.delete();
>@@ -480,7 +481,7 @@
> 		if (slashIndex > -1) {
> 			String remoteParentPath = remotePath.substring(0, slashIndex);
> 			String remoteFileName = remotePath.substring(slashIndex + 1, remotePath.length());
>-			boolean isBinary = isBinary(srcEncoding, rmtEncoding, remotePath);
>+			boolean isBinary = SystemFileTransferModeRegistry.getFileTransferModeDefaultPreference()==ISystemFilePreferencesConstants.FILETRANSFERMODE_BINARY;
> 			if (ArchiveHandlerManager.isVirtual(remotePath))
> 			{
> 				AbsoluteVirtualPath avp = new AbsoluteVirtualPath(remotePath);
>@@ -500,7 +501,7 @@
> 		String remoteParentPath = destination.getParentPath();
> 		String remoteFileName = destination.getName();
> 		String hostEncoding = destination.getEncoding();
>-		boolean isBinary = isBinary(encoding, hostEncoding, destination.getAbsolutePath());
>+		boolean isBinary = SystemFileTransferModeRegistry.getFileTransferModeDefaultPreference()==ISystemFilePreferencesConstants.FILETRANSFERMODE_BINARY;
> 
> 		if (!destination.canWrite())
> 		{

Actions: View | Diff

Attachments on bug 199773: 78177 | 78297 | 78307