mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00
Code Issues Wiki Activity

[194481] fix: [dstore][Archive] Save Conflict After Renaming a File that is Open

Browse source
This commit is contained in:
Xuan Chen 2008-01-07 22:04:15 +00:00
parent aa89e38eab
commit bdb3b3357b
3 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java
View file

@ -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) - [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 * 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 * 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; package org.eclipse.rse.dstore.universal.miners;
@ -858,9 +859,11 @@ public class UniversalFileSystemMiner extends Miner {
DataElement status, String queryType) { DataElement status, String queryType) {
File fileobj = null; File fileobj = null;
boolean isVirtual = false; boolean isVirtual = false;
boolean isFilter = false;
String fullName = subject.getValue(); String fullName = subject.getValue();
if (queryType.equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)) if (queryType.equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR))
{ {
isFilter = true;
isVirtual = ArchiveHandlerManager.isVirtual(fullName); isVirtual = ArchiveHandlerManager.isVirtual(fullName);
String filterValue = subject.getValue(); String filterValue = subject.getValue();
// . translates to home dir // . translates to home dir
@ -891,6 +894,10 @@ public class UniversalFileSystemMiner extends Miner {
fileobj = new File(path, name); fileobj = new File(path, name);
} }
} }
else if (queryType.equals(IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR) || queryType.equals(IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR))
{
isVirtual = true;
}
else { else {
UniversalServerUtilities.logError(CLASSNAME, UniversalServerUtilities.logError(CLASSNAME,
"Invalid query type to handleQueryGetRemoteObject", null); //$NON-NLS-1$ "Invalid query type to handleQueryGetRemoteObject", null); //$NON-NLS-1$
@ -962,8 +969,17 @@ public class UniversalFileSystemMiner extends Miner {
status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS); status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS);
} else if (isVirtual) { } else if (isVirtual) {
try { try {
String goodFullName = ArchiveHandlerManager String goodFullPath = ArchiveHandlerManager
.cleanUpVirtualPath(fullName); .cleanUpVirtualPath(fullName);
String goodFullName = null;
if (isFilter)
{
goodFullName = goodFullPath;
}
else
{
goodFullName = goodFullPath + "/" + subject.getName(); //$NON-NLS-1$
}
AbsoluteVirtualPath avp = new AbsoluteVirtualPath(goodFullName); AbsoluteVirtualPath avp = new AbsoluteVirtualPath(goodFullName);
VirtualChild child = _archiveHandlerManager VirtualChild child = _archiveHandlerManager
.getVirtualObject(goodFullName); .getVirtualObject(goodFullName);
@ -988,11 +1004,11 @@ public class UniversalFileSystemMiner extends Miner {
IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR); IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR);
String name = child.name; String name = child.name;
String path = avp.getContainingArchiveString(); String path = avp.getContainingArchiveString();
if (!child.path.equals("")) { //$NON-NLS-1$
path = path path = path
+ ArchiveHandlerManager.VIRTUAL_SEPARATOR + ArchiveHandlerManager.VIRTUAL_SEPARATOR
+ child.path; + child.path;
}
subject.setAttribute(DE.A_NAME, name); subject.setAttribute(DE.A_NAME, name);
subject.setAttribute(DE.A_VALUE, path); subject.setAttribute(DE.A_VALUE, path);
@ -1508,6 +1524,12 @@ public class UniversalFileSystemMiner extends Miner {
_dataStore.createReference(cancellable, createNewFolderInFolderDescriptor, DataStoreResources.model_abstracts, DataStoreResources.model_abstracted_by); _dataStore.createReference(cancellable, createNewFolderInFolderDescriptor, DataStoreResources.model_abstracts, DataStoreResources.model_abstracted_by);
createCommandDescriptor(FileDescriptors._deUniversalFolderObject, "GetOSType", IUniversalDataStoreConstants.C_GET_OSTYPE); //$NON-NLS-1$ createCommandDescriptor(FileDescriptors._deUniversalFolderObject, "GetOSType", IUniversalDataStoreConstants.C_GET_OSTYPE); //$NON-NLS-1$
createCommandDescriptor(FileDescriptors._deUniversalFileObject, "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 // create a download command descriptor and make it cancelable
DataElement downloadDescriptor = createCommandDescriptor( DataElement downloadDescriptor = createCommandDescriptor(

1
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java
View file

@ -232,7 +232,6 @@ public class CopyThread extends Thread implements ICancellableHandler {
public void cancel() { public void cancel() {
_isCancelled = true; _isCancelled = true;
System.out.println("Inside cancel() of thread " + CLASSNAME);
if (null != systemOperationMonitor) if (null != systemOperationMonitor)
{ {
systemOperationMonitor.setCanceled(true); systemOperationMonitor.setCanceled(true);

1
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java
View file

@ -60,7 +60,6 @@ public class DeleteThread extends Thread implements ICancellableHandler {
public void cancel() { public void cancel() {
_isCancelled = true; _isCancelled = true;
System.out.println("Inside cancel() of thread " + CLASSNAME);
if (null != systemOperationMonitor) if (null != systemOperationMonitor)
{ {
systemOperationMonitor.setCanceled(true); systemOperationMonitor.setCanceled(true);