mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

filtering fix - reused results were not filtered for dstore

Browse source
This commit is contained in:
David McKnight 2007-02-16 15:13:41 +00:00
parent f87607f37c
commit 468c37bc5e
1 changed files with 23 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/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java
View file

@ -42,6 +42,7 @@ import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalFileSystemMin
import org.eclipse.rse.services.clientserver.IServiceConstants;
import org.eclipse.rse.services.clientserver.ISystemFileTypes;
import org.eclipse.rse.services.clientserver.PathUtility;
import org.eclipse.rse.services.clientserver.StringCompare;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@ -827,13 +828,28 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
return file;
}
protected IHostFile[] convertToHostFiles(DataElement[] elements)
protected IHostFile[] convertToHostFiles(DataElement[] elements, String filter)
{
ArrayList results = new ArrayList();
ArrayList results = new ArrayList(elements.length);
for (int i = 0; i < elements.length; i++)
{
if (!elements[i].isDeleted())
results.add(convertToHostFile(elements[i]));
DataElement element = elements[i];
if (!element.isDeleted())
{
String type = element.getType();
// filter files
if (type.equals(UNIVERSAL_FILE_DESCRIPTOR) || type.equals(UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR))
{
if (StringCompare.compare(filter, element.getName(), true))
{
results.add(convertToHostFile(element));
}
}
else
{
results.add(convertToHostFile(element));
}
}
}
return (IHostFile[]) results.toArray(new IHostFile[results.size()]);
}
@ -1158,7 +1174,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
DataElement deObj = ds.createObject(universaltemp, UNIVERSAL_FILTER_DESCRIPTOR, "", "", "", false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
DataElement[] results = dsQueryCommand(monitor, deObj, C_QUERY_ROOTS);
return convertToHostFiles(results);
return convertToHostFiles(results, "*"); //$NON-NLS-1$
}
@ -1220,7 +1236,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
args.add(attributes);
DataElement[] results = dsQueryCommand(monitor, deObj, args, queryType);
return convertToHostFiles(results);
return convertToHostFiles(results, fileFilter);
}
public boolean isCaseSensitive()
@ -1290,7 +1306,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
DataElement queryCmd = ds.localDescriptorQuery(encodingElement.getDescriptor(), C_SYSTEM_ENCODING);
DataElement status = ds.command(queryCmd, encodingElement, true);
ds.command(queryCmd, encodingElement, true);
remoteEncoding = encodingElement.getValue();
}