mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-09 01:55:24 +02:00
Code Issues Wiki Activity

some fixes related to Bug 162707

Browse source
This commit is contained in:
David McKnight 2006-11-02 20:27:43 +00:00
parent 7d1d41c300
commit 641c5d348e
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java
View file

@ -497,7 +497,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
fs = remoteFile.getParentRemoteFileSubSystem(); fs = remoteFile.getParentRemoteFileSubSystem();
if (!remoteFile.exists()) if (!remoteFile.exists())
{ {
fs.createFile(remoteFile); remoteFile = fs.createFile(remoteFile);
} }
} }
catch (SystemMessageException e) catch (SystemMessageException e)
@ -512,7 +512,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
try try
{ {
// copy temp file to remote system // 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 // set original time stamp to 0 so that file will be overwritten next download
properties.setRemoteFileTimeStamp(0); properties.setRemoteFileTimeStamp(0);

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java
View file

@ -163,7 +163,7 @@ public class SaveAsForm extends SystemSelectRemoteFileOrFolderForm {
super.setPreSelection(parentFile); super.setPreSelection(parentFile);
} }
fileName = parentFile.getName(); fileName = selection.getName();//parentFile.getName();
initialFileName=fileName; initialFileName=fileName;
} }
} }

1
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
View file

@ -115,7 +115,6 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
{ {
if (subsystem instanceof IRemoteFileSubSystem) if (subsystem instanceof IRemoteFileSubSystem)
{ {
Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell();
IRemoteFileSubSystem fs = (IRemoteFileSubSystem) subsystem; IRemoteFileSubSystem fs = (IRemoteFileSubSystem) subsystem;
// first we need to get the stored timestamp property and the actual remote timestamp // first we need to get the stored timestamp property and the actual remote timestamp

2
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java
View file

@ -59,7 +59,7 @@ public class DStoreHostFile implements IHostFile
} }
if (lastSlash > 0 && lastSlash != path.length() - 1) if (lastSlash > 0 && lastSlash != path.length() - 1)
{ {
return path.substring(lastSlash); return path.substring(lastSlash + 1);
} }
return path; return path;
} }