mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-09 18:56:02 +02:00
fix for 153638
This commit is contained in:
parent
c2c9afef9b
commit
7b48b49495
2 changed files with 13 additions and 4 deletions
|
@ -1127,13 +1127,21 @@ private DataElement createDataElementFromLSString(DataElement subject,
|
||||||
|
|
||||||
private DataElement handleDeleteBatch(DataElement theElement, DataElement status)
|
private DataElement handleDeleteBatch(DataElement theElement, DataElement status)
|
||||||
{
|
{
|
||||||
|
DataElement substatus = _dataStore.createObject(null, "status", "substatus");
|
||||||
int numOfSources = theElement.getNestedSize() - 2;
|
int numOfSources = theElement.getNestedSize() - 2;
|
||||||
for (int i = 0; i < numOfSources; i++)
|
for (int i = 0; i < numOfSources; i++)
|
||||||
{
|
{
|
||||||
DataElement subject = getCommandArgument(theElement, i+1);
|
DataElement subject = getCommandArgument(theElement, i+1);
|
||||||
handleDelete(subject, status, false);
|
handleDelete(subject, substatus, false);
|
||||||
if (!status.getSource().startsWith(SUCCESS)) return statusDone(status);
|
/*
|
||||||
|
if (!substatus.getSource().startsWith(SUCCESS))
|
||||||
|
{
|
||||||
|
status.setAttribute(DE.A_SOURCE, substatus.getSource());
|
||||||
|
return statusDone(status);
|
||||||
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
status.setAttribute(DE.A_SOURCE, substatus.getSource());
|
||||||
return statusDone(status);
|
return statusDone(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -900,8 +900,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
|
||||||
}
|
}
|
||||||
DataElement status = dsStatusCommand(monitor, (DataElement) dataElements.get(0), dataElements, C_DELETE_BATCH);
|
DataElement status = dsStatusCommand(monitor, (DataElement) dataElements.get(0), dataElements, C_DELETE_BATCH);
|
||||||
if (status == null) return false;
|
if (status == null) return false;
|
||||||
if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) return true;
|
if (FileSystemMessageUtil.getSourceMessage(status).startsWith(IServiceConstants.FAILED))
|
||||||
else throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));
|
throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));
|
||||||
|
else return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean rename(IProgressMonitor monitor, String remoteParent, String oldName, String newName) throws SystemMessageException
|
public boolean rename(IProgressMonitor monitor, String remoteParent, String oldName, String newName) throws SystemMessageException
|
||||||
|
|
Loading…
Add table
Reference in a new issue