1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 15:45:25 +02:00

fix for Bug 160186

This commit is contained in:
David McKnight 2006-10-18 17:16:54 +00:00
parent deaf8a489b
commit adde5c1eda
2 changed files with 13 additions and 3 deletions

View file

@ -357,13 +357,21 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
{
RemoteFileFilterString rffs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), filterString.getString());
String container = rffs.getPath();
if (container == null)
return false;
boolean affected = false;
String remoteObjectContainer = remoteObjectAbsoluteName;
int lastSep = remoteObjectAbsoluteName.lastIndexOf(getSeparator());
if (lastSep != -1)
{
remoteObjectContainer = remoteObjectAbsoluteName.substring(0, lastSep);
}
if (filterString.getParentSystemFilter().isStringsCaseSensitive())
affected = container.equals(remoteObjectAbsoluteName);
affected = container.equals(remoteObjectContainer);
else
affected = container.equalsIgnoreCase(remoteObjectAbsoluteName);
affected = container.equalsIgnoreCase(remoteObjectContainer);
//UniversalSystemPlugin.logDebugMessage(
// "UniversalFileSubSystemImpl::doesFilterStringListContentsOf",

View file

@ -704,7 +704,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
{
for (int idx=0; !would && (idx<strings.length); idx++)
{
if (strings[idx].equals("*"))
if (strings[idx].getString().equals("*"))
would = true;
else if (strings[idx].getString().equals("./*"))
would = true;
else
would = doesFilterStringMatch(strings[idx].getString(), remoteObjectAbsoluteName, strings[idx].getParentSystemFilter().areStringsCaseSensitive());