You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/10/04 20:01:53 UTC
[23/46] lucenenet git commit: Facet: Changed accessibility of class
members to match Java Lucene.
Facet: Changed accessibility of class members to match Java Lucene.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9912999c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9912999c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9912999c
Branch: refs/heads/master
Commit: 9912999c154159dfcf0f87106132fb85a763271f
Parents: e76ee90
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Sep 25 14:40:30 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Oct 3 23:31:26 2016 +0700
----------------------------------------------------------------------
src/Lucene.Net.Facet/Range/DoubleRange.cs | 8 ++++----
src/Lucene.Net.Facet/Range/LongRange.cs | 12 +++++------
.../DefaultSortedSetDocValuesReaderState.cs | 2 +-
.../Directory/DirectoryTaxonomyWriter.cs | 10 +++++-----
src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs | 4 ++--
.../Taxonomy/WriterCache/CharBlockArray.cs | 21 ++++++++++----------
6 files changed, 28 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9912999c/src/Lucene.Net.Facet/Range/DoubleRange.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Range/DoubleRange.cs b/src/Lucene.Net.Facet/Range/DoubleRange.cs
index 058ff52..affdf26 100644
--- a/src/Lucene.Net.Facet/Range/DoubleRange.cs
+++ b/src/Lucene.Net.Facet/Range/DoubleRange.cs
@@ -178,10 +178,10 @@ namespace Lucene.Net.Facet.Range
{
private readonly FilterAnonymousInnerClassHelper outerInstance;
- private Bits acceptDocs;
- private FunctionValues values;
- private int maxDoc;
- private Bits fastMatchBits;
+ private readonly Bits acceptDocs;
+ private readonly FunctionValues values;
+ private readonly int maxDoc;
+ private readonly Bits fastMatchBits;
public DocIdSetAnonymousInnerClassHelper(FilterAnonymousInnerClassHelper outerInstance, Bits acceptDocs, FunctionValues values, int maxDoc, Bits fastMatchBits)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9912999c/src/Lucene.Net.Facet/Range/LongRange.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Range/LongRange.cs b/src/Lucene.Net.Facet/Range/LongRange.cs
index eb7671b..7b245f9 100644
--- a/src/Lucene.Net.Facet/Range/LongRange.cs
+++ b/src/Lucene.Net.Facet/Range/LongRange.cs
@@ -120,8 +120,8 @@ namespace Lucene.Net.Facet.Range
{
private readonly LongRange outerInstance;
- private Filter fastMatchFilter;
- private ValueSource valueSource;
+ private readonly Filter fastMatchFilter;
+ private readonly ValueSource valueSource;
public FilterAnonymousInnerClassHelper(LongRange outerInstance, Filter fastMatchFilter, ValueSource valueSource)
{
@@ -175,10 +175,10 @@ namespace Lucene.Net.Facet.Range
{
private readonly FilterAnonymousInnerClassHelper outerInstance;
- private Bits acceptDocs;
- private FunctionValues values;
- private int maxDoc;
- private Bits fastMatchBits;
+ private readonly Bits acceptDocs;
+ private readonly FunctionValues values;
+ private readonly int maxDoc;
+ private readonly Bits fastMatchBits;
public DocIdSetAnonymousInnerClassHelper(FilterAnonymousInnerClassHelper outerInstance, Bits acceptDocs, FunctionValues values, int maxDoc, Bits fastMatchBits)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9912999c/src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs b/src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs
index 10983d8..a5806c3 100644
--- a/src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs
+++ b/src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Facet.SortedSet
/// <summary>
/// <seealso cref="IndexReader"/> passed to the constructor. </summary>
- public readonly IndexReader origReader;
+ private readonly IndexReader origReader;
private readonly IDictionary<string, OrdRange> prefixToOrdRange = new Dictionary<string, OrdRange>();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9912999c/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
index b6dc7a1..e4f2d3b 100644
--- a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
@@ -582,11 +582,11 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
private class SinglePositionTokenStream : TokenStream
{
- internal ICharTermAttribute termAtt;
- internal IPositionIncrementAttribute posIncrAtt;
- internal bool returned;
- internal int val;
- internal readonly string word;
+ private ICharTermAttribute termAtt;
+ private IPositionIncrementAttribute posIncrAtt;
+ private bool returned;
+ private int val;
+ private readonly string word;
public SinglePositionTokenStream(string word)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9912999c/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
index f94ebe4..4dc391e 100644
--- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
@@ -70,8 +70,8 @@ namespace Lucene.Net.Facet.Taxonomy
/// An iterator over a category's children. </summary>
public class ChildrenIterator
{
- internal readonly int[] siblings;
- internal int child;
+ private readonly int[] siblings;
+ private int child;
internal ChildrenIterator(int child, int[] siblings)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9912999c/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArray.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArray.cs b/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArray.cs
index 691ed41..60a0726 100644
--- a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArray.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArray.cs
@@ -92,12 +92,12 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
return index % blockSize;
}
- public CharBlockArray Append(ICharSequence chars)
+ public virtual CharBlockArray Append(ICharSequence chars)
{
return Append(chars, 0, chars.Length);
}
- public CharBlockArray Append(char c)
+ public virtual CharBlockArray Append(char c)
{
if (this.current.length == this.blockSize)
{
@@ -109,7 +109,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
return this;
}
- public CharBlockArray Append(ICharSequence chars, int start, int length)
+ public virtual CharBlockArray Append(ICharSequence chars, int start, int length)
{
int end = start + length;
for (int i = start; i < end; i++)
@@ -170,8 +170,13 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
this.length_Renamed += s.Length;
return this;
}
+ public virtual char CharAt(int index)
+ {
+ Block b = blocks[BlockIndex(index)];
+ return b.chars[IndexInBlock(index)];
+ }
- public int Length
+ public virtual int Length
{
get
{
@@ -179,13 +184,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
}
}
- public char CharAt(int index)
- {
- Block b = blocks[BlockIndex(index)];
- return b.chars[IndexInBlock(index)];
- }
-
- public string SubSequence(int start, int end)
+ public virtual string SubSequence(int start, int end)
{
int remaining = end - start;
StringBuilder sb = new StringBuilder(remaining);