mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-17 21:25:58 +02:00
Code Issues Wiki Activity

Bug 142182: Copying archives to local connection file system does not work

Browse source
This commit is contained in:
Kushal Munir 2006-05-18 19:47:06 +00:00
parent de80315a4f
commit 1370bbef90
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalFileService.java
View file

@ -446,12 +446,11 @@ public class LocalFileService extends AbstractFileService implements IFileServic
File target = new File(remoteParent, remoteFile); File target = new File(remoteParent, remoteFile);
boolean sourceIsVirtual = ArchiveHandlerManager.isVirtual(localFile.getAbsolutePath()); boolean sourceIsVirtual = ArchiveHandlerManager.isVirtual(localFile.getAbsolutePath());
boolean targetIsVirtual = ArchiveHandlerManager.isVirtual(target.getAbsolutePath()); boolean targetIsVirtual = ArchiveHandlerManager.isVirtual(target.getAbsolutePath());
boolean targetIsArchive = ArchiveHandlerManager.getInstance().isArchive(target);
if (sourceIsVirtual) if (sourceIsVirtual)
{ {
return copyFromArchive(localFile, target, remoteFile, monitor, srcEncoding, hostEncoding, !isBinary); return copyFromArchive(localFile, target, remoteFile, monitor, srcEncoding, hostEncoding, !isBinary);
} }
if (targetIsVirtual || targetIsArchive) if (targetIsVirtual)
{ {
return copyToArchive(localFile, target, remoteFile, monitor, srcEncoding, hostEncoding, !isBinary); return copyToArchive(localFile, target, remoteFile, monitor, srcEncoding, hostEncoding, !isBinary);
} }

6
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
View file

@ -450,6 +450,12 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
String remoteParentPath = remotePath.substring(0, slashIndex); String remoteParentPath = remotePath.substring(0, slashIndex);
String remoteFileName = remotePath.substring(slashIndex + 1, remotePath.length()); String remoteFileName = remotePath.substring(slashIndex + 1, remotePath.length());
boolean isBinary = isBinary(srcEncoding, rmtEncoding, remotePath); boolean isBinary = isBinary(srcEncoding, rmtEncoding, remotePath);
if (ArchiveHandlerManager.isVirtual(remotePath))
{
AbsoluteVirtualPath avp = new AbsoluteVirtualPath(remotePath);
remoteParentPath = avp.getPath();
remoteFileName = avp.getName();
}
try try
{ {
getFileService().upload(monitor, new File(source), remoteParentPath, remoteFileName, isBinary, srcEncoding, rmtEncoding); getFileService().upload(monitor, new File(source), remoteParentPath, remoteFileName, isBinary, srcEncoding, rmtEncoding);