mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 15:15:25 +02:00
Code Issues Wiki Activity

[256609] [dstore] need to make sure element is resolved properly before finding it's command descriptors

Browse source
This commit is contained in:
David McKnight 2009-02-03 18:05:07 +00:00
parent 250aeb21c7
commit 39d696a0d9
1 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
View file

@ -52,6 +52,7 @@
* David McKnight (IBM) - [250168] some backward compatibility issues with old IBM dstore server
* David McKnight (IBM) - [251429] Pasting local folder to remote does not work in some case
* David McKnight (IBM) - [261375] [dstore] problem comparing virtual path when getting cached element
* David McKnight (IBM) - [256609] [dstore] need to make sure element is resolved properly before finding it's command descriptors
*******************************************************************************/
package org.eclipse.rse.internal.services.dstore.files;
@ -1433,6 +1434,12 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
{
String remotePath = remoteParent + getSeparator(remoteParent) + fileName;
DataElement de = getElementFor(remotePath);
// if we don't have a proper element, we won't have a command descriptor
if (de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
// need to fetch
dsQueryCommand(de, null, IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT, monitor);
}
DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_DELETE, monitor);
if (status == null)
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
@ -1462,6 +1469,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
throw new SystemMessageException(msg);
}
public void deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException
{
@ -1475,7 +1483,14 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
{
String remotePath = remoteParents[i] + getSeparator(remoteParents[i]) + fileNames[i];
DataElement de = getElementFor(remotePath);
if (de != null) dataElements.add(de);
// if we don't have a proper element, we won't have a command descriptor
if (de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
// need to fetch
dsQueryCommand(de, null, IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT, monitor);
}
if (de != null)
dataElements.add(de);
}
DataElement status = dsStatusCommand((DataElement) dataElements.get(0), dataElements, IUniversalDataStoreConstants.C_DELETE_BATCH, monitor);
@ -1528,7 +1543,11 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
}
DataElement de = getElementFor(oldPath);
// if we don't have a proper element, we won't have a command descriptor
if (de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
// need to fetch
dsQueryCommand(de, null, IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT, monitor);
}
// new servers use the full path
de.setAttribute(DE.A_SOURCE, newPath);
@ -1805,6 +1824,11 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
{
String srcRemotePath = srcParents[i] + getSeparator(srcParents[i]) + srcNames[i];
DataElement srcDE = getElementFor(srcRemotePath);
// if we don't have a proper element, we won't have a command descriptor
if (srcDE.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
// need to fetch
dsQueryCommand(srcDE, null, IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT, monitor);
}
args.add(srcDE);
}
DataElement status = ds.command(cpCmd, args, tgtDE, true);
@ -2125,6 +2149,12 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
{
String remotePath = parent + getSeparator(parent) + name;
DataElement de = getElementFor(remotePath);
// if we don't have a proper element, we won't have a command descriptor
if (de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
// need to fetch
dsQueryCommand(de, null, IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT, monitor);
}
DataStore ds = de.getDataStore();
if (ds != null)
{
@ -2148,6 +2178,12 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
{
String remotePath = parent + getSeparator(parent) + name;
DataElement de = getElementFor(remotePath);
// if we don't have a proper element, we won't have a command descriptor
if (de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
// need to fetch
dsQueryCommand(de, null, IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT, monitor);
}
DataStore ds = de.getDataStore();
if (ds != null)
{