View | Details | Raw Unified | Return to bug 202670 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java (-7 / +9 lines)
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 1487-1499 Link Here
1487
			targetFS.copy(compressedFolder, newTargetParent, newTargetFolder.getName(), monitor);
1492
			targetFS.copy(compressedFolder, newTargetParent, newTargetFolder.getName(), monitor);
1488
			
1493
			
1489
			// delete the temp remote archive
1494
			// delete the temp remote archive
1490
			//Since this archive file has never been cache before, a default filter DStore Element
1495
			// now, DStoreFileService#getFile() (which is invoked by getRemoteFileObject() call)
1491
			//will be created before we send down "delete" commad to dstore server. Since "delete" 
1496
			// has been updated to also put the query object into the dstore file map,
1492
			//command is not a registered command for a filter
1497
			// we don't need to do the query on the remoteArchive object before the 
1493
			//element, the delete command query will not be sent to dstore server.
1498
			// delete.
1494
			//To overcome this problem, we need to do query on it first to cache
1495
			//its information so that it could be deleted properly.
1496
			targetFS.resolveFilterString(newPath + RemoteFileFilterString.SWITCH_NOSUBDIRS, monitor);
1497
			targetFS.delete(remoteArchive, monitor);
1499
			targetFS.delete(remoteArchive, monitor);
1498
			
1500
			
1499
			monitor.done();
1501
			monitor.done();
(-)src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java (-1 / +4 lines)
Lines 18-23 Link Here
18
 * David McKnight   (IBM)        - [190803] Canceling a long-running dstore job prints "InterruptedException" to stdout 
18
 * David McKnight   (IBM)        - [190803] Canceling a long-running dstore job prints "InterruptedException" to stdout 
19
 * David McKnight   (IBM)        - [196035] Wrapper SystemMessageExceptions for createFile and createFolder with RemoteFileSecurityException
19
 * David McKnight   (IBM)        - [196035] Wrapper SystemMessageExceptions for createFile and createFolder with RemoteFileSecurityException
20
 * Kevin Doyle 		(IBM)		 - [191548] Deleting Read-Only directory removes it from view and displays no error
20
 * Kevin Doyle 		(IBM)		 - [191548] Deleting Read-Only directory removes it from view and displays no error
21
 * Xuan Chen        (IBM)        - [202670] [Supertransfer] After doing a copy to a directory that contains folders some folders name's display "deleted"
21
 ********************************************************************************/
22
 ********************************************************************************/
22
23
23
package org.eclipse.rse.internal.services.dstore.files;
24
package org.eclipse.rse.internal.services.dstore.files;
Lines 775-781 Link Here
775
			de = getElementFor(buf.toString());
776
			de = getElementFor(buf.toString());
776
		}
777
		}
777
		dsQueryCommand(de, IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT, monitor);
778
		dsQueryCommand(de, IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT, monitor);
778
		return new DStoreHostFile(de);
779
		//getFile call should also need to convert this DataElement into a HostFile using
780
		//convertToHostFile() call.  This way, this DataElement will be put into _fileMap.
781
		return convertToHostFile(de);
779
	}
782
	}
780
783
781
	/**
784
	/**

Return to bug 202670