mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-14 20:45:22 +02:00
[192884] Should not use filter to determine previous query results
This commit is contained in:
parent
90e3c722c5
commit
031f379d36
1 changed files with 161 additions and 175 deletions
|
@ -9,7 +9,7 @@
|
||||||
* component that contains this file: David McKnight.
|
* component that contains this file: David McKnight.
|
||||||
*
|
*
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* {Name} (company) - description of contribution.
|
* David McKnight (IBM) - [192884] Should not use filter to determine previous query results
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
|
package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
|
||||||
|
|
||||||
|
@ -22,7 +22,6 @@ import java.util.List;
|
||||||
import org.eclipse.dstore.core.model.DE;
|
import org.eclipse.dstore.core.model.DE;
|
||||||
import org.eclipse.dstore.core.model.DataElement;
|
import org.eclipse.dstore.core.model.DataElement;
|
||||||
import org.eclipse.dstore.core.model.DataStore;
|
import org.eclipse.dstore.core.model.DataStore;
|
||||||
import org.eclipse.dstore.core.util.StringCompare;
|
|
||||||
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
|
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
|
||||||
import org.eclipse.rse.dstore.universal.miners.UniversalFileSystemMiner;
|
import org.eclipse.rse.dstore.universal.miners.UniversalFileSystemMiner;
|
||||||
import org.eclipse.rse.dstore.universal.miners.UniversalServerUtilities;
|
import org.eclipse.rse.dstore.universal.miners.UniversalServerUtilities;
|
||||||
|
@ -139,10 +138,10 @@ public class FileQueryThread extends QueryThread
|
||||||
{
|
{
|
||||||
createDataElement(ds, subject, list, queryType, filter, include, null);
|
createDataElement(ds, subject, list, queryType, filter, include, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method to create the DataElement object in the datastore.
|
* Method to create the DataElement object in the datastore.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
protected void createDataElement(DataStore ds, DataElement subject,
|
protected void createDataElement(DataStore ds, DataElement subject,
|
||||||
File[] list, String queryType, String filter, int include, String types[])
|
File[] list, String queryType, String filter, int include, String types[])
|
||||||
{
|
{
|
||||||
|
@ -161,22 +160,9 @@ public class FileQueryThread extends QueryThread
|
||||||
DataElement child = (DataElement)children.get(f);
|
DataElement child = (DataElement)children.get(f);
|
||||||
if (!child.isDeleted())
|
if (!child.isDeleted())
|
||||||
{
|
{
|
||||||
String type = child.getType();
|
|
||||||
if (type.equals(IUniversalDataStoreConstants.UNIVERSAL_FILE_DESCRIPTOR) || type.equals(IUniversalDataStoreConstants.UNIVERSAL_ARCHIVE_FILE_DESCRIPTOR))
|
|
||||||
{
|
|
||||||
if (StringCompare.compare(filter, child.getName(), false))
|
|
||||||
{
|
|
||||||
//filteredChildren.add(child);
|
|
||||||
filteredChildren.put(child.getName(), child);
|
filteredChildren.put(child.getName(), child);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
//filteredChildren.add(child);
|
|
||||||
filteredChildren.put(child.getName(), child);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue