mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-04 23:55:26 +02:00
some fixes related to Bug 162707
This commit is contained in:
parent
7d1d41c300
commit
641c5d348e
4 changed files with 4 additions and 5 deletions
|
@ -497,7 +497,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
|
|||
fs = remoteFile.getParentRemoteFileSubSystem();
|
||||
if (!remoteFile.exists())
|
||||
{
|
||||
fs.createFile(remoteFile);
|
||||
remoteFile = fs.createFile(remoteFile);
|
||||
}
|
||||
}
|
||||
catch (SystemMessageException e)
|
||||
|
@ -512,7 +512,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
|
|||
try
|
||||
{
|
||||
// copy temp file to remote system
|
||||
fs.uploadUTF8(_tempFile, remoteFile, null);
|
||||
fs.uploadUTF8(_tempFile, remoteFile, new NullProgressMonitor());
|
||||
|
||||
// set original time stamp to 0 so that file will be overwritten next download
|
||||
properties.setRemoteFileTimeStamp(0);
|
||||
|
|
|
@ -163,7 +163,7 @@ public class SaveAsForm extends SystemSelectRemoteFileOrFolderForm {
|
|||
super.setPreSelection(parentFile);
|
||||
}
|
||||
|
||||
fileName = parentFile.getName();
|
||||
fileName = selection.getName();//parentFile.getName();
|
||||
initialFileName=fileName;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -115,7 +115,6 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
|
|||
{
|
||||
if (subsystem instanceof IRemoteFileSubSystem)
|
||||
{
|
||||
Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell();
|
||||
IRemoteFileSubSystem fs = (IRemoteFileSubSystem) subsystem;
|
||||
|
||||
// first we need to get the stored timestamp property and the actual remote timestamp
|
||||
|
|
|
@ -59,7 +59,7 @@ public class DStoreHostFile implements IHostFile
|
|||
}
|
||||
if (lastSlash > 0 && lastSlash != path.length() - 1)
|
||||
{
|
||||
return path.substring(lastSlash);
|
||||
return path.substring(lastSlash + 1);
|
||||
}
|
||||
return path;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue