Skip to content

Commit

Permalink
Variable renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
wilbaker committed Oct 2, 2018
1 parent ec71c14 commit 355ead8
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions GVFS/GVFS.Platform.Windows/ActiveEnumeration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ namespace GVFS.Platform.Windows
{
public class ActiveEnumeration
{
private static FileNamePatternMatcher wildcardPatternMatcher = null;
private static FileNamePatternMatcher doesWildcardPatternMatch = null;

// Use our own enumerator to avoid having to dispose anything
private ProjectedFileInfoEnumerator fileInfoEnumerator;
private FileNamePatternMatcher patternMatcher;
private FileNamePatternMatcher doesPatternMatch;

private string filterString = null;

Expand Down Expand Up @@ -43,7 +43,7 @@ public ProjectedFileInfo Current
/// <param name="patternMatcher">FileNamePatternMatcher to be used by ActiveEnumeration</param>
public static void SetWildcardPatternMatcher(FileNamePatternMatcher patternMatcher)
{
wildcardPatternMatcher = patternMatcher;
doesWildcardPatternMatch = patternMatcher;
}

/// <summary>
Expand Down Expand Up @@ -109,7 +109,7 @@ public string GetFilterString()
return this.filterString;
}

private static bool NameMatchsNoWildcardFilter(string name, string filter)
private static bool NameMatchesNoWildcardFilter(string name, string filter)
{
return string.Equals(name, filter, System.StringComparison.OrdinalIgnoreCase);
}
Expand All @@ -119,19 +119,19 @@ private void SaveFilter(string filter)
if (string.IsNullOrEmpty(filter))
{
this.filterString = string.Empty;
this.patternMatcher = null;
this.doesPatternMatch = null;
}
else
{
this.filterString = filter;

if (ProjFS.Utils.DoesNameContainWildCards(this.filterString))
{
this.patternMatcher = wildcardPatternMatcher;
this.doesPatternMatch = doesWildcardPatternMatch;
}
else
{
this.patternMatcher = NameMatchsNoWildcardFilter;
this.doesPatternMatch = NameMatchesNoWildcardFilter;
}

if (this.IsCurrentValid && this.IsCurrentHidden())
Expand All @@ -143,12 +143,12 @@ private void SaveFilter(string filter)

private bool IsCurrentHidden()
{
if (this.patternMatcher == null)
if (this.doesPatternMatch == null)
{
return false;
}

return !this.patternMatcher(this.Current.Name, this.GetFilterString());
return !this.doesPatternMatch(this.Current.Name, this.GetFilterString());
}

private void ResetEnumerator()
Expand Down

0 comments on commit 355ead8

Please sign in to comment.