|
Lines 17-22
Link Here
|
| 17 |
* Kevin Doyle (IBM) - [182221] Throwing Proper Exceptions on create file/folder |
17 |
* Kevin Doyle (IBM) - [182221] Throwing Proper Exceptions on create file/folder |
| 18 |
* Xuan Chen (IBM) - Fix 189487 - copy and paste a folder did not work - workbench hang |
18 |
* Xuan Chen (IBM) - Fix 189487 - copy and paste a folder did not work - workbench hang |
| 19 |
* David McKnight (IBM) - [192705] Exception needs to be thrown when rename fails |
19 |
* David McKnight (IBM) - [192705] Exception needs to be thrown when rename fails |
|
|
20 |
* Kevin Doyle (IBM) - [196211] Move a folder to a directory that contains a folder by that name errors |
| 20 |
********************************************************************************/ |
21 |
********************************************************************************/ |
| 21 |
|
22 |
|
| 22 |
package org.eclipse.rse.internal.services.local.files; |
23 |
package org.eclipse.rse.internal.services.local.files; |
|
Lines 1045-1074
Link Here
|
| 1045 |
|
1046 |
|
| 1046 |
public boolean move(String srcParent, String srcName, String tgtParent, String tgtName, IProgressMonitor monitor) throws SystemMessageException |
1047 |
public boolean move(String srcParent, String srcName, String tgtParent, String tgtName, IProgressMonitor monitor) throws SystemMessageException |
| 1047 |
{ |
1048 |
{ |
| 1048 |
File sourceFolderOrFile = new File(srcParent, srcName); |
1049 |
// File sourceFolderOrFile = new File(srcParent, srcName); |
| 1049 |
File targetFolder = new File(tgtParent, tgtName); |
1050 |
// File targetFolder = new File(tgtParent, tgtName); |
| 1050 |
boolean sourceIsVirtual = ArchiveHandlerManager.isVirtual(sourceFolderOrFile.getAbsolutePath()); |
1051 |
// boolean sourceIsVirtual = ArchiveHandlerManager.isVirtual(sourceFolderOrFile.getAbsolutePath()); |
| 1051 |
boolean targetIsVirtual = ArchiveHandlerManager.isVirtual(targetFolder.getAbsolutePath()); |
1052 |
// boolean targetIsVirtual = ArchiveHandlerManager.isVirtual(targetFolder.getAbsolutePath()); |
| 1052 |
boolean targetIsArchive = ArchiveHandlerManager.getInstance().isArchive(targetFolder); |
1053 |
// boolean targetIsArchive = ArchiveHandlerManager.getInstance().isArchive(targetFolder); |
| 1053 |
if (sourceIsVirtual || targetIsVirtual || targetIsArchive) |
1054 |
// if (sourceIsVirtual || targetIsVirtual || targetIsArchive) |
| 1054 |
/* DKM |
1055 |
/* DKM |
| 1055 |
* we shouldn't be moving archives like virtuals |
1056 |
* we shouldn't be moving archives like virtuals |
| 1056 |
*|| ArchiveHandlerManager.getInstance().isRegisteredArchive(newName) |
1057 |
*|| ArchiveHandlerManager.getInstance().isRegisteredArchive(newName) |
| 1057 |
* |
1058 |
* |
| 1058 |
*/ |
1059 |
*/ |
| 1059 |
{ |
1060 |
// { |
| 1060 |
if (copy(srcParent, srcName, tgtParent, tgtName, monitor)) |
1061 |
if (copy(srcParent, srcName, tgtParent, tgtName, monitor)) |
| 1061 |
{ |
1062 |
{ |
| 1062 |
return delete(srcParent, srcName, monitor); |
1063 |
return delete(srcParent, srcName, monitor); |
| 1063 |
} |
1064 |
} |
| 1064 |
else return false; |
1065 |
else return false; |
| 1065 |
} |
1066 |
// } |
| 1066 |
else |
1067 |
// else |
| 1067 |
{ |
1068 |
// { |
| 1068 |
File fileToMove = new File(srcParent, srcName); |
1069 |
// File fileToMove = new File(srcParent, srcName); |
| 1069 |
File newFile = new File(tgtParent, tgtName); |
1070 |
// File newFile = new File(tgtParent, tgtName); |
| 1070 |
return fileToMove.renameTo(newFile); |
1071 |
// return fileToMove.renameTo(newFile); |
| 1071 |
} |
1072 |
// } |
| 1072 |
} |
1073 |
} |
| 1073 |
|
1074 |
|
| 1074 |
|
1075 |
|
