|
Lines 24-29
Link Here
|
| 24 |
* David McKnight (IBM) - [191472] should not use super transfer with SSH/FTP Folder Copy and Paste |
24 |
* David McKnight (IBM) - [191472] should not use super transfer with SSH/FTP Folder Copy and Paste |
| 25 |
* Xuan Chen (IBM) - [191367] with supertransfer on, Drag & Drop Folder from DStore to DStore doesn't work |
25 |
* Xuan Chen (IBM) - [191367] with supertransfer on, Drag & Drop Folder from DStore to DStore doesn't work |
| 26 |
* Xuan Chen (IBM) - [201790] [dnd] Copy and Paste across connections to a Drive doesn't work |
26 |
* Xuan Chen (IBM) - [201790] [dnd] Copy and Paste across connections to a Drive doesn't work |
|
|
27 |
* Xuan Chen (IBM) - [202668] [Supertransfer] Subfolders not copied when doing first copy from dstore to Local |
| 28 |
* Xuan Chen (IBM) - [202670] [Supertransfer] After doing a copy to a directory that contains folders some folders name's display "deleted" |
| 27 |
********************************************************************************/ |
29 |
********************************************************************************/ |
| 28 |
|
30 |
|
| 29 |
package org.eclipse.rse.files.ui.resources; |
31 |
package org.eclipse.rse.files.ui.resources; |
|
Lines 1175-1180
Link Here
|
| 1175 |
} |
1177 |
} |
| 1176 |
else |
1178 |
else |
| 1177 |
{ |
1179 |
{ |
|
|
1180 |
//sometimes, IContainer#members does not return the right members under |
| 1181 |
//this folder. We need to call refreshLocal() first to overcome this problem |
| 1182 |
directory.refreshLocal(IResource.DEPTH_ONE, monitor); |
| 1178 |
IResource[] children = directory.members(); |
1183 |
IResource[] children = directory.members(); |
| 1179 |
SystemWorkspaceResourceSet childSet = new SystemWorkspaceResourceSet(children); |
1184 |
SystemWorkspaceResourceSet childSet = new SystemWorkspaceResourceSet(children); |
| 1180 |
SystemRemoteResourceSet childResults = copyWorkspaceResourcesToRemote(childSet, newTargetFolder, monitor, checkForCollisions); |
1185 |
SystemRemoteResourceSet childResults = copyWorkspaceResourcesToRemote(childSet, newTargetFolder, monitor, checkForCollisions); |
|
Lines 1493-1499
Link Here
|
| 1493 |
//element, the delete command query will not be sent to dstore server. |
1498 |
//element, the delete command query will not be sent to dstore server. |
| 1494 |
//To overcome this problem, we need to do query on it first to cache |
1499 |
//To overcome this problem, we need to do query on it first to cache |
| 1495 |
//its information so that it could be deleted properly. |
1500 |
//its information so that it could be deleted properly. |
| 1496 |
targetFS.resolveFilterString(newPath + RemoteFileFilterString.SWITCH_NOSUBDIRS, monitor); |
1501 |
targetFS.resolveFilterString(newTargetParent, null, monitor); |
| 1497 |
targetFS.delete(remoteArchive, monitor); |
1502 |
targetFS.delete(remoteArchive, monitor); |
| 1498 |
|
1503 |
|
| 1499 |
monitor.done(); |
1504 |
monitor.done(); |
|
Lines 1748-1762
Link Here
|
| 1748 |
catch (SystemMessageException e) |
1753 |
catch (SystemMessageException e) |
| 1749 |
{ |
1754 |
{ |
| 1750 |
SystemMessageDialog.displayMessage(e); |
1755 |
SystemMessageDialog.displayMessage(e); |
|
|
1756 |
cpdest.getParentRemoteFileSubSystem().resolveFilterString(cpdest.getParentRemoteFile(), null, monitor); |
| 1751 |
cleanup(cpdest, dest); |
1757 |
cleanup(cpdest, dest); |
|
|
1758 |
monitor.done(); |
| 1759 |
return targetResource; |
| 1752 |
} |
1760 |
} |
| 1753 |
catch (Exception e) |
1761 |
catch (Exception e) |
| 1754 |
{ |
1762 |
{ |
| 1755 |
e.printStackTrace(); |
1763 |
e.printStackTrace(); |
|
|
1764 |
cpdest.getParentRemoteFileSubSystem().resolveFilterString(cpdest.getParentRemoteFile(), null, monitor); |
| 1756 |
cleanup(cpdest, dest); |
1765 |
cleanup(cpdest, dest); |
| 1757 |
throw e; |
1766 |
throw e; |
| 1758 |
} |
1767 |
} |
| 1759 |
|
1768 |
|
|
|
1769 |
// delete the temp remote archive |
| 1770 |
//Since this archive file has never been cache before, a default filter DStore Element |
| 1771 |
//will be created before we send down "delete" commad to dstore server. Since "delete" |
| 1772 |
//command is not a registered command for a filter |
| 1773 |
//element, the delete command query will not be sent to dstore server. |
| 1774 |
//To overcome this problem, we need to do query on it first to cache |
| 1775 |
//its information so that it could be deleted properly. |
| 1776 |
cpdest.getParentRemoteFileSubSystem().resolveFilterString(cpdest.getParentRemoteFile(), null, monitor); |
| 1760 |
cleanup(cpdest, dest); |
1777 |
cleanup(cpdest, dest); |
| 1761 |
monitor.done(); |
1778 |
monitor.done(); |
| 1762 |
return targetResource; |
1779 |
return targetResource; |
