Attachment 86353 Details for Bug 194481 – fix for this problem.

[patch] fix for this problem.

patch_194481.txt (text/plain), 6.68 KB, created by Xuan Chen

on 2008-01-07 17:03:30 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Xuan Chen

Created: 2008-01-07 17:03:30 EST

Size: 6.68 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java,v
>retrieving revision 1.27
>diff -u -r1.27 UniversalFileSystemMiner.java
>--- miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java	20 Dec 2007 05:55:06 -0000	1.27
>+++ miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java	7 Jan 2008 22:00:00 -0000
>@@ -26,7 +26,8 @@
>  * Xuan Chen (IBM)        - [202949] [archives] copy a folder from one connection to an archive file in a different connection does not work
>  * Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread
>  * David McKnight   (IBM)        - [196624] dstore miner IDs should be String constants rather than dynamic lookup
>- * * Xuan Chen (IBM) - [209827] Update DStore command implementation to enable cancelation of archive operations
>+ * Xuan Chen (IBM) - [209827] Update DStore command implementation to enable cancelation of archive operations
>+ * Xuan Chen (IBM) - [194481] [dstore][Archive] Save Conflict After Renaming a File that is Open
>  *******************************************************************************/
> 
> package org.eclipse.rse.dstore.universal.miners;
>@@ -858,9 +859,11 @@
> 			DataElement status, String queryType) {
> 		File fileobj = null;
> 		boolean isVirtual = false;
>+		boolean isFilter = false;
> 		String fullName = subject.getValue();
> 		if (queryType.equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)) 
> 		{
>+			isFilter = true;
> 			isVirtual = ArchiveHandlerManager.isVirtual(fullName);
> 			String filterValue = subject.getValue();
> 			// . translates to home dir
>@@ -891,6 +894,10 @@
> 				fileobj = new File(path, name);		
> 			}
> 		}
>+		else if (queryType.equals(IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR) || queryType.equals(IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR))
>+		{
>+			isVirtual = true;
>+		}
> 		else {
> 			UniversalServerUtilities.logError(CLASSNAME,
> 					"Invalid query type to handleQueryGetRemoteObject", null); //$NON-NLS-1$
>@@ -962,8 +969,17 @@
> 			status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS);
> 		} else if (isVirtual) {
> 			try {
>-				String goodFullName = ArchiveHandlerManager
>+				String goodFullPath = ArchiveHandlerManager
> 						.cleanUpVirtualPath(fullName);
>+				String goodFullName = null;
>+				if (isFilter)
>+				{
>+					goodFullName = goodFullPath;
>+				}
>+				else
>+				{
>+					goodFullName = goodFullPath + "/" + subject.getName();  //$NON-NLS-1$
>+				}
> 				AbsoluteVirtualPath avp = new AbsoluteVirtualPath(goodFullName);
> 				VirtualChild child = _archiveHandlerManager
> 						.getVirtualObject(goodFullName);
>@@ -988,11 +1004,11 @@
> 								IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR);
> 						String name = child.name;
> 						String path = avp.getContainingArchiveString();
>-						if (!child.path.equals("")) { //$NON-NLS-1$
>+						
> 							path = path
> 									+ ArchiveHandlerManager.VIRTUAL_SEPARATOR
> 									+ child.path;
>-						}
>+						
> 
> 						subject.setAttribute(DE.A_NAME, name);
> 						subject.setAttribute(DE.A_VALUE, path);
>@@ -1508,7 +1524,13 @@
> 		_dataStore.createReference(cancellable, createNewFolderInFolderDescriptor, DataStoreResources.model_abstracts, DataStoreResources.model_abstracted_by);
> 		createCommandDescriptor(FileDescriptors._deUniversalFolderObject, "GetOSType", IUniversalDataStoreConstants.C_GET_OSTYPE); //$NON-NLS-1$
> 		createCommandDescriptor(FileDescriptors._deUniversalFileObject, "GetOSType", IUniversalDataStoreConstants.C_GET_OSTYPE); //$NON-NLS-1$
>-
>+        //make sure C_QUERY_GET_REMOTE_OBJECT command also available for file and folder objects
>+		createCommandDescriptor(FileDescriptors._deUniversalFolderObject, "GetRemoteObject", IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT); //$NON-NLS-1$
>+		createCommandDescriptor(FileDescriptors._deUniversalFileObject, "GetRemoteObject", IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT); //$NON-NLS-1$
>+		createCommandDescriptor(FileDescriptors._deUniversalArchiveFileObject, "GetRemoteObject", IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT); //$NON-NLS-1$
>+		createCommandDescriptor(FileDescriptors._deUniversalVirtualFileObject, "GetRemoteObject", IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT); //$NON-NLS-1$
>+		createCommandDescriptor(FileDescriptors._deUniversalVirtualFolderObject, "GetRemoteObject", IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT); //$NON-NLS-1$
>+		
> 		// create a download command descriptor and make it cancelable
> 		DataElement downloadDescriptor = createCommandDescriptor(
> 				FileDescriptors._deUniversalFileObject, "DownloadFile", IUniversalDataStoreConstants.C_DOWNLOAD_FILE); //$NON-NLS-1$
>Index: miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java,v
>retrieving revision 1.1
>diff -u -r1.1 DeleteThread.java
>--- miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java	19 Dec 2007 03:04:33 -0000	1.1
>+++ miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java	7 Jan 2008 22:00:00 -0000
>@@ -60,7 +60,6 @@
> 
> 	public void cancel() {
> 		_isCancelled = true;
>-		System.out.println("Inside cancel() of thread " + CLASSNAME);
> 		if (null != systemOperationMonitor)
> 		{
> 			systemOperationMonitor.setCanceled(true);
>Index: miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java,v
>retrieving revision 1.1
>diff -u -r1.1 CopyThread.java
>--- miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java	19 Dec 2007 03:04:33 -0000	1.1
>+++ miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java	7 Jan 2008 22:00:00 -0000
>@@ -232,7 +232,6 @@
> 
> 	public void cancel() {
> 		_isCancelled = true;
>-		System.out.println("Inside cancel() of thread " + CLASSNAME);
> 		if (null != systemOperationMonitor)
> 		{
> 			systemOperationMonitor.setCanceled(true);

Actions: View | Diff

Attachments on bug 194481: 86353