You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2016/11/10 11:34:07 UTC
[56/58] [abbrv] lucenenet git commit: Grouping: Renamed _other
parameter to other
Grouping: Renamed _other parameter to other
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/987a9854
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/987a9854
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/987a9854
Branch: refs/heads/grouping
Commit: 987a985456c8aedd53b5aabe21b3488948460a61
Parents: 04f4013
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Mon Nov 7 23:07:09 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Tue Nov 8 02:48:34 2016 +0700
----------------------------------------------------------------------
src/Lucene.Net.Grouping/SearchGroup.cs | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/987a9854/src/Lucene.Net.Grouping/SearchGroup.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/SearchGroup.cs b/src/Lucene.Net.Grouping/SearchGroup.cs
index bbf2082..a3ad0d3 100644
--- a/src/Lucene.Net.Grouping/SearchGroup.cs
+++ b/src/Lucene.Net.Grouping/SearchGroup.cs
@@ -140,39 +140,39 @@ namespace Lucene.Net.Search.Grouping
}
// Only for assert
- private bool NeverEquals(object _other)
+ private bool NeverEquals(object other)
{
- if (_other is MergedGroup<T>)
+ if (other is MergedGroup<T>)
{
- MergedGroup<T> other = (MergedGroup<T>)_other;
+ MergedGroup<T> otherMergedGroup = (MergedGroup<T>)other;
if (groupValue == null)
{
- Debug.Assert(other.groupValue != null);
+ Debug.Assert(otherMergedGroup.groupValue != null);
}
else
{
- Debug.Assert(!groupValue.Equals(other.groupValue));
+ Debug.Assert(!groupValue.Equals(otherMergedGroup.groupValue));
}
}
return true;
}
- public override bool Equals(object _other)
+ public override bool Equals(object other)
{
// We never have another MergedGroup instance with
// same groupValue
- Debug.Assert(NeverEquals(_other));
+ Debug.Assert(NeverEquals(other));
- if (_other is MergedGroup<T>)
+ if (other is MergedGroup<T>)
{
- MergedGroup<T> other = (MergedGroup<T>)_other;
+ MergedGroup<T> otherMergedGroup = (MergedGroup<T>)other;
if (groupValue == null)
{
- return other == null;
+ return otherMergedGroup == null;
}
else
{
- return groupValue.Equals(other);
+ return groupValue.Equals(otherMergedGroup);
}
}
else