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/09/11 21:31:08 UTC
[37/50] [abbrv] lucenenet git commit: Fixed accessibility of classes
and members to match that of Java.
Fixed accessibility of classes and members to match that of Java.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/387d985b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/387d985b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/387d985b
Branch: refs/heads/master
Commit: 387d985b71edd4e7962a9fdbe6124d7cab3262f0
Parents: 679ad24
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Tue Aug 2 18:27:12 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Sep 2 22:30:55 2016 +0700
----------------------------------------------------------------------
.../Analyzing/AnalyzingQueryParser.cs | 2 +-
.../Classic/QueryParser.cs | 8 ++--
.../Classic/QueryParserBase.cs | 44 ++++++++++----------
.../Classic/QueryParserTokenManager.cs | 16 +++----
.../Classic/TokenMgrError.cs | 8 ++--
.../ComplexPhrase/ComplexPhraseQueryParser.cs | 2 +-
.../Ext/ExtendableQueryParser.cs | 2 +-
.../Ext/ExtensionQuery.cs | 6 +--
src/Lucene.Net.QueryParser/Ext/Extensions.cs | 8 ++--
.../Surround/Parser/QueryParserTokenManager.cs | 3 +-
.../Surround/Parser/TokenMgrError.cs | 8 ++--
.../Surround/Query/BasicQueryFactory.cs | 8 ++--
.../Surround/Query/ComposedQuery.cs | 2 +-
.../Surround/Query/DistanceQuery.cs | 2 +-
.../Surround/Query/FieldsQuery.cs | 2 +-
.../Surround/Query/RewriteQuery.cs | 2 +-
.../Surround/Query/SimpleTerm.cs | 4 +-
.../Surround/Query/SimpleTermRewriteQuery.cs | 2 +-
.../Surround/Query/SpanNearClauseFactory.cs | 2 +-
.../Surround/Query/SrndBooleanQuery.cs | 2 +-
.../Surround/Query/SrndQuery.cs | 1 -
.../Classic/TestQueryParser.cs | 2 +-
22 files changed, 67 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs b/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs
index 8930aa4..d61b9d0 100644
--- a/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs
@@ -138,7 +138,7 @@ namespace Lucene.Net.QueryParser.Analyzing
/// <param name="chunk">The portion of the given termStr to be analyzed</param>
/// <returns>The result of analyzing the given chunk</returns>
/// <exception cref="ParseException">ParseException when analysis returns other than one output token</exception>
- protected internal string AnalyzeSingleChunk(string field, string termStr, string chunk)
+ protected internal virtual string AnalyzeSingleChunk(string field, string termStr, string chunk)
{
string analyzed = null;
TokenStream stream = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Classic/QueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/QueryParser.cs b/src/Lucene.Net.QueryParser/Classic/QueryParser.cs
index e86c716..f52b4f7 100644
--- a/src/Lucene.Net.QueryParser/Classic/QueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Classic/QueryParser.cs
@@ -191,7 +191,7 @@ namespace Lucene.Net.QueryParser.Classic
}
// This makes sure that there is no garbage after the query string
- public override Query TopLevelQuery(string field)
+ public override sealed Query TopLevelQuery(string field)
{
Query q;
q = Query(field);
@@ -322,7 +322,7 @@ namespace Lucene.Net.QueryParser.Classic
throw new Exception("Missing return statement in function");
}
- public Query Term(String field)
+ public Query Term(string field)
{
Token term, boost = null, fuzzySlop = null, goop1, goop2;
bool prefix = false;
@@ -618,7 +618,7 @@ namespace Lucene.Net.QueryParser.Classic
};
}
- private JJCalls[] jj_2_rtns = new JJCalls[1];
+ private readonly JJCalls[] jj_2_rtns = new JJCalls[1];
private bool jj_rescan = false;
private int jj_gc = 0;
@@ -656,7 +656,7 @@ namespace Lucene.Net.QueryParser.Classic
}
/// <summary>Reinitialise. </summary>
- public void ReInit(QueryParserTokenManager tm)
+ public virtual void ReInit(QueryParserTokenManager tm)
{
token_source = tm;
token = new Token();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
index 599110e..3e80f4a 100644
--- a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
+++ b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
@@ -32,7 +32,7 @@ namespace Lucene.Net.QueryParser.Classic
* limitations under the License.
*/
- public abstract partial class QueryParserBase : QueryBuilder, ICommonQueryParserConfiguration
+ public abstract class QueryParserBase : QueryBuilder, ICommonQueryParserConfiguration
{
/// <summary>
/// Do not catch this exception in your code, it means you are using methods that you should no longer use.
@@ -138,7 +138,7 @@ namespace Lucene.Net.QueryParser.Classic
/// <param name="matchVersion">Lucene version to match.</param>
/// <param name="f">the default field for query terms.</param>
/// <param name="a">used to find terms in the query text.</param>
- public void Init(LuceneVersion matchVersion, string f, Analyzer a)
+ public virtual void Init(LuceneVersion matchVersion, string f, Analyzer a)
{
Analyzer = a;
field = f;
@@ -191,7 +191,7 @@ namespace Lucene.Net.QueryParser.Classic
/// <summary>
/// Returns the default field.
/// </summary>
- public string Field
+ public virtual string Field
{
get { return field; }
}
@@ -211,20 +211,20 @@ namespace Lucene.Net.QueryParser.Classic
/// Get or Set the minimum similarity for fuzzy queries.
/// Default is 2f.
/// </summary>
- public float FuzzyMinSim { get; set; }
+ public virtual float FuzzyMinSim { get; set; }
/// <summary>
/// Get or Set the prefix length for fuzzy queries.
/// Default is 0.
/// </summary>
- public int FuzzyPrefixLength { get; set; }
+ public virtual int FuzzyPrefixLength { get; set; }
/// <summary>
/// Gets or Sets the default slop for phrases.
/// If zero, then exact phrase matches are required.
/// Default value is zero.
/// </summary>
- public int PhraseSlop { get; set; }
+ public virtual int PhraseSlop { get; set; }
/// <summary>
/// Set to <code>true</code> to allow leading wildcard characters.
@@ -236,7 +236,7 @@ namespace Lucene.Net.QueryParser.Classic
/// <p>
/// Default: false.
/// </summary>
- public bool AllowLeadingWildcard { get; set; }
+ public virtual bool AllowLeadingWildcard { get; set; }
/// <summary>
/// Gets or Sets the boolean operator of the QueryParser.
@@ -246,13 +246,13 @@ namespace Lucene.Net.QueryParser.Classic
/// In <code>AND_OPERATOR</code> mode terms are considered to be in conjunction: the
/// above mentioned query is parsed as <code>capital AND of AND Hungary
/// </summary>
- public Operator DefaultOperator { get; set; }
+ public virtual Operator DefaultOperator { get; set; }
/// <summary>
/// Whether terms of wildcard, prefix, fuzzy and range queries are to be automatically
// lower-cased or not. Default is <code>true</code>.
/// </summary>
- public bool LowercaseExpandedTerms { get; set; }
+ public virtual bool LowercaseExpandedTerms { get; set; }
/// <summary>
/// By default QueryParser uses <see cref="MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT"/>
@@ -264,22 +264,22 @@ namespace Lucene.Net.QueryParser.Classic
/// points are not relevant then use this to change
/// the rewrite method.
/// </summary>
- public MultiTermQuery.RewriteMethod MultiTermRewriteMethod { get; set; }
+ public virtual MultiTermQuery.RewriteMethod MultiTermRewriteMethod { get; set; }
/// <summary>
/// Get or Set locale used by date range parsing, lowercasing, and other
/// locale-sensitive operations.
/// </summary>
- public CultureInfo Locale { get; set; }
+ public virtual CultureInfo Locale { get; set; }
- public TimeZoneInfo TimeZone { get; set; }
+ public virtual TimeZoneInfo TimeZone { get; set; }
/// <summary>
/// Gets or Sets the default date resolution used by RangeQueries for fields for which no
/// specific date resolutions has been set. Field specific resolutions can be set
/// with <see cref="SetDateResolution(string,DateTools.Resolution)"/>.
/// </summary>
- public void SetDateResolution(DateTools.Resolution dateResolution)
+ public virtual void SetDateResolution(DateTools.Resolution dateResolution)
{
this.dateResolution = dateResolution;
}
@@ -289,7 +289,7 @@ namespace Lucene.Net.QueryParser.Classic
/// </summary>
/// <param name="fieldName">field for which the date resolution is to be set</param>
/// <param name="dateResolution">date resolution to set</param>
- public void SetDateResolution(string fieldName, DateTools.Resolution dateResolution)
+ public virtual void SetDateResolution(string fieldName, DateTools.Resolution dateResolution)
{
if (string.IsNullOrEmpty(fieldName))
{
@@ -312,7 +312,7 @@ namespace Lucene.Net.QueryParser.Classic
/// </summary>
/// <param name="fieldName"></param>
/// <returns></returns>
- public DateTools.Resolution GetDateResolution(string fieldName)
+ public virtual DateTools.Resolution GetDateResolution(string fieldName)
{
if (string.IsNullOrEmpty(fieldName))
{
@@ -339,7 +339,7 @@ namespace Lucene.Net.QueryParser.Classic
/// For example, setting this to true can enable analyzing terms into
/// collation keys for locale-sensitive <see cref="TermRangeQuery"/>.
/// </summary>
- public bool AnalyzeRangeTerms { get; set; }
+ public virtual bool AnalyzeRangeTerms { get; set; }
protected internal virtual void AddClause(IList<BooleanClause> clauses, int conj, int mods, Query q)
{
@@ -548,7 +548,7 @@ namespace Lucene.Net.QueryParser.Classic
return new FuzzyQuery(term, numEdits, prefixLength);
}
- // LUCENE TODO: Should this be protected instead?
+ // LUCENETODO: Should this be protected instead?
private BytesRef AnalyzeMultitermTerm(string field, string part)
{
return AnalyzeMultitermTerm(field, part, Analyzer);
@@ -802,7 +802,7 @@ namespace Lucene.Net.QueryParser.Classic
}
// extracted from the .jj grammar
- protected internal virtual Query HandleBareTokenQuery(string qfield, Token term, Token fuzzySlop, bool prefix, bool wildcard, bool fuzzy, bool regexp)
+ internal virtual Query HandleBareTokenQuery(string qfield, Token term, Token fuzzySlop, bool prefix, bool wildcard, bool fuzzy, bool regexp)
{
Query q;
@@ -830,7 +830,7 @@ namespace Lucene.Net.QueryParser.Classic
return q;
}
- protected internal virtual Query HandleBareFuzzy(string qfield, Token fuzzySlop, string termImage)
+ internal virtual Query HandleBareFuzzy(string qfield, Token fuzzySlop, string termImage)
{
Query q;
float fms = FuzzyMinSim;
@@ -852,7 +852,7 @@ namespace Lucene.Net.QueryParser.Classic
}
// extracted from the .jj grammar
- protected internal virtual Query HandleQuotedTerm(string qfield, Token term, Token fuzzySlop)
+ internal virtual Query HandleQuotedTerm(string qfield, Token term, Token fuzzySlop)
{
int s = PhraseSlop; // default
if (fuzzySlop != null)
@@ -867,7 +867,7 @@ namespace Lucene.Net.QueryParser.Classic
}
// extracted from the .jj grammar
- protected internal virtual Query HandleBoost(Query q, Token boost)
+ internal virtual Query HandleBoost(Query q, Token boost)
{
if (boost != null)
{
@@ -901,7 +901,7 @@ namespace Lucene.Net.QueryParser.Classic
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- protected internal virtual string DiscardEscapeChar(string input)
+ internal virtual string DiscardEscapeChar(string input)
{
// Create char array to hold unescaped char sequence
char[] output = new char[input.Length];
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs b/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
index aac1505..ca7f2f4 100644
--- a/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
@@ -1170,14 +1170,14 @@ namespace Lucene.Net.QueryParser.Classic
}
/// <summary>Reinitialise parser. </summary>
- public virtual void ReInit(ICharStream stream)
+ public virtual void ReInit(ICharStream stream)
{
jjmatchedPos = jjnewStateCnt = 0;
curLexState = defaultLexState;
input_stream = stream;
ReInitRounds();
}
- private void ReInitRounds()
+ private void ReInitRounds()
{
int i;
jjround = 0x80000001;
@@ -1186,14 +1186,14 @@ namespace Lucene.Net.QueryParser.Classic
}
/// <summary>Reinitialise parser. </summary>
- public virtual void ReInit(ICharStream stream, int lexState)
+ public virtual void ReInit(ICharStream stream, int lexState)
{
ReInit(stream);
SwitchTo(lexState);
}
/// <summary>Switch to specified lex state. </summary>
- public virtual void SwitchTo(int lexState)
+ public virtual void SwitchTo(int lexState)
{
if (lexState >= 3 || lexState < 0)
throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
@@ -1322,7 +1322,7 @@ EOFLoop: ;
}
}
- private void JjCheckNAdd(int state)
+ private void JjCheckNAdd(int state)
{
if (jjrounds[state] != jjround)
{
@@ -1330,7 +1330,7 @@ EOFLoop: ;
jjrounds[state] = jjround;
}
}
- private void JjAddStates(int start, int end)
+ private void JjAddStates(int start, int end)
{
do
{
@@ -1338,13 +1338,13 @@ EOFLoop: ;
}
while (start++ != end);
}
- private void JjCheckNAddTwoStates(int state1, int state2)
+ private void JjCheckNAddTwoStates(int state1, int state2)
{
JjCheckNAdd(state1);
JjCheckNAdd(state2);
}
- private void JjCheckNAddStates(int start, int end)
+ private void JjCheckNAddStates(int start, int end)
{
do
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs b/src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs
index 2f69e13..a5ef460 100644
--- a/src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs
+++ b/src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs
@@ -29,16 +29,16 @@ namespace Lucene.Net.QueryParser.Classic
*/
/// <summary> Lexical error occurred.</summary>
- internal const int LEXICAL_ERROR = 0;
+ internal static readonly int LEXICAL_ERROR = 0;
/// <summary> An attempt was made to create a second instance of a static token manager.</summary>
- internal const int STATIC_LEXER_ERROR = 1;
+ internal static readonly int STATIC_LEXER_ERROR = 1;
/// <summary> Tried to change to an invalid lexical state.</summary>
- internal const int INVALID_LEXICAL_STATE = 2;
+ internal static readonly int INVALID_LEXICAL_STATE = 2;
/// <summary> Detected (and bailed out of) an infinite loop in the token manager.</summary>
- internal const int LOOP_DETECTED = 3;
+ internal static readonly int LOOP_DETECTED = 3;
/// <summary> Indicates the reason why the exception is thrown. It will have
/// one of the above 4 values.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs b/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs
index 0ac7c5b..fb30753 100644
--- a/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs
@@ -58,7 +58,7 @@ namespace Lucene.Net.QueryParser.ComplexPhrase
/// exists in the documents as the same order as in query.
/// Choose between ordered (true) or un-ordered (false) proximity search.
/// </summary>
- public bool InOrder { get; set; }
+ public virtual bool InOrder { get; internal set; }
private ComplexPhraseQuery currentPhraseQuery = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Ext/ExtendableQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Ext/ExtendableQueryParser.cs b/src/Lucene.Net.QueryParser/Ext/ExtendableQueryParser.cs
index 6418f87..ee45f17 100644
--- a/src/Lucene.Net.QueryParser/Ext/ExtendableQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Ext/ExtendableQueryParser.cs
@@ -109,7 +109,7 @@ namespace Lucene.Net.QueryParser.Ext
/// Returns the extension field delimiter character.
/// </summary>
/// <returns>the extension field delimiter character.</returns>
- public char ExtensionFieldDelimiter
+ public virtual char ExtensionFieldDelimiter
{
get { return extensions.ExtensionFieldDelimiter; }
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Ext/ExtensionQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Ext/ExtensionQuery.cs b/src/Lucene.Net.QueryParser/Ext/ExtensionQuery.cs
index 610e4ad..fc86c2e 100644
--- a/src/Lucene.Net.QueryParser/Ext/ExtensionQuery.cs
+++ b/src/Lucene.Net.QueryParser/Ext/ExtensionQuery.cs
@@ -39,16 +39,16 @@
/// <summary>
/// Returns the query field
/// </summary>
- public string Field { get; protected set; }
+ public virtual string Field { get; protected set; }
/// <summary>
/// Returns the raw extension query string
/// </summary>
- public string RawQueryString { get; protected set; }
+ public virtual string RawQueryString { get; protected set; }
/// <summary>
/// Returns the top level parser which created this <see cref="ExtensionQuery"/>
/// </summary>
- public Classic.QueryParser TopLevelParser { get; protected set; }
+ public virtual Classic.QueryParser TopLevelParser { get; protected set; }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Ext/Extensions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Ext/Extensions.cs b/src/Lucene.Net.QueryParser/Ext/Extensions.cs
index 6895268..af6146c 100644
--- a/src/Lucene.Net.QueryParser/Ext/Extensions.cs
+++ b/src/Lucene.Net.QueryParser/Ext/Extensions.cs
@@ -94,7 +94,7 @@ namespace Lucene.Net.QueryParser.Ext
/// <param name="field">the extension field string</param>
/// <returns>a {<see cref="Tuple{String,String}"/> with the field name as the <see cref="Tuple{String,String}.Item1"/> and the
/// extension key as the <see cref="Tuple{String,String}.Item2"/></returns>
- public Tuple<string, string> SplitExtensionField(string defaultField, string field)
+ public virtual Tuple<string, string> SplitExtensionField(string defaultField, string field)
{
int indexOf = field.IndexOf(this.extensionFieldDelimiter);
if (indexOf < 0)
@@ -111,7 +111,7 @@ namespace Lucene.Net.QueryParser.Ext
/// <param name="extfield">the extension field identifier</param>
/// <returns>the extension field identifier with all special chars escaped with
/// a backslash character.</returns>
- public string EscapeExtensionField(string extfield)
+ public virtual string EscapeExtensionField(string extfield)
{
return QueryParserBase.Escape(extfield);
}
@@ -132,7 +132,7 @@ namespace Lucene.Net.QueryParser.Ext
/// </summary>
/// <param name="extensionKey">the extension key</param>
/// <returns>escaped extension field identifier</returns>
- public string BuildExtensionField(string extensionKey)
+ public virtual string BuildExtensionField(string extensionKey)
{
return BuildExtensionField(extensionKey, "");
}
@@ -154,7 +154,7 @@ namespace Lucene.Net.QueryParser.Ext
/// <param name="field">the field to apply the extension on.</param>
/// <returns>escaped extension field identifier</returns>
/// <remarks>See <see cref="M:BuildExtensionField(String)"/> to use the default query field</remarks>
- public string BuildExtensionField(string extensionKey, string field)
+ public virtual string BuildExtensionField(string extensionKey, string field)
{
StringBuilder builder = new StringBuilder(field);
builder.Append(this.extensionFieldDelimiter);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
index ac3d611..3e7b281 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
@@ -651,7 +651,7 @@ namespace Lucene.Net.QueryParser.Surround.Parser
/// <summary>Get the next Token.</summary>
[SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
- public Token GetNextToken()
+ public virtual Token GetNextToken()
{
Token matchedToken;
int curPos = 0;
@@ -755,6 +755,5 @@ namespace Lucene.Net.QueryParser.Surround.Parser
JjCheckNAdd(jjnextStates[start]);
} while (start++ != end);
}
-
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Parser/TokenMgrError.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/TokenMgrError.cs b/src/Lucene.Net.QueryParser/Surround/Parser/TokenMgrError.cs
index 2ccfc58..79120c7 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/TokenMgrError.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/TokenMgrError.cs
@@ -29,16 +29,16 @@ namespace Lucene.Net.QueryParser.Surround.Parser
*/
/// <summary> Lexical error occurred.</summary>
- internal const int LEXICAL_ERROR = 0;
+ internal static readonly int LEXICAL_ERROR = 0;
/// <summary> An attempt was made to create a second instance of a static token manager.</summary>
- internal const int STATIC_LEXER_ERROR = 1;
+ internal static readonly int STATIC_LEXER_ERROR = 1;
/// <summary> Tried to change to an invalid lexical state.</summary>
- internal const int INVALID_LEXICAL_STATE = 2;
+ internal static readonly int INVALID_LEXICAL_STATE = 2;
/// <summary> Detected (and bailed out of) an infinite loop in the token manager.</summary>
- internal const int LOOP_DETECTED = 3;
+ internal static readonly int LOOP_DETECTED = 3;
/// <summary> Indicates the reason why the exception is thrown. It will have
/// one of the above 4 values.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Query/BasicQueryFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/BasicQueryFactory.cs b/src/Lucene.Net.QueryParser/Surround/Query/BasicQueryFactory.cs
index 8992746..b0c6d36 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/BasicQueryFactory.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/BasicQueryFactory.cs
@@ -52,8 +52,8 @@ namespace Lucene.Net.QueryParser.Surround.Query
private int maxBasicQueries;
private int queriesMade;
- public int NrQueriesMade { get { return queriesMade; } }
- public int MaxBasicQueries { get { return maxBasicQueries; } }
+ public virtual int NrQueriesMade { get { return queriesMade; } }
+ public virtual int MaxBasicQueries { get { return maxBasicQueries; } }
public override string ToString()
{
@@ -76,13 +76,13 @@ namespace Lucene.Net.QueryParser.Surround.Query
queriesMade++;
}
- public TermQuery NewTermQuery(Term term)
+ public virtual TermQuery NewTermQuery(Term term)
{
CheckMax();
return new TermQuery(term);
}
- public SpanTermQuery NewSpanTermQuery(Term term)
+ public virtual SpanTermQuery NewSpanTermQuery(Term term)
{
CheckMax();
return new SpanTermQuery(term);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
index d421ad6..05010fd 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
@@ -57,7 +57,7 @@ namespace Lucene.Net.QueryParser.Surround.Query
private bool operatorInfix;
public virtual bool IsOperatorInfix { get { return operatorInfix; } } /* else prefix operator */
- public IEnumerable<Search.Query> MakeLuceneSubQueriesField(string fn, BasicQueryFactory qf)
+ public virtual IEnumerable<Search.Query> MakeLuceneSubQueriesField(string fn, BasicQueryFactory qf)
{
List<Search.Query> luceneSubQueries = new List<Search.Query>();
IEnumerator<SrndQuery> sqi = GetSubQueriesEnumerator();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs
index 1ca7a01..20ef47d 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs
@@ -77,7 +77,7 @@ namespace Lucene.Net.QueryParser.Surround.Query
sncf.AddSpanQuery(snq);
}
- public Search.Query GetSpanNearQuery(
+ public virtual Search.Query GetSpanNearQuery(
IndexReader reader,
String fieldName,
float boost,
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
index 912bf36..228c7d6 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
@@ -52,7 +52,7 @@ namespace Lucene.Net.QueryParser.Surround.Query
get { return false; }
}
- public Search.Query MakeLuceneQueryNoBoost(BasicQueryFactory qf)
+ public virtual Search.Query MakeLuceneQueryNoBoost(BasicQueryFactory qf)
{
if (fieldNames.Count() == 1)
{ /* single field name: no new queries needed */
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
index 030923f..a5795ee 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
@@ -20,7 +20,7 @@ namespace Lucene.Net.QueryParser.Surround.Query
* limitations under the License.
*/
- public abstract class RewriteQuery<SQ> : Search.Query
+ internal abstract class RewriteQuery<SQ> : Search.Query
{
protected readonly SQ srndQuery;
protected readonly string fieldName;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Query/SimpleTerm.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SimpleTerm.cs b/src/Lucene.Net.QueryParser/Surround/Query/SimpleTerm.cs
index 5e39e03..77877bb 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/SimpleTerm.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/SimpleTerm.cs
@@ -80,12 +80,12 @@ namespace Lucene.Net.QueryParser.Surround.Query
void VisitMatchingTerm(Term t);
}
- public string DistanceSubQueryNotAllowed()
+ public virtual string DistanceSubQueryNotAllowed()
{
return null;
}
- public void AddSpanQueries(SpanNearClauseFactory sncf)
+ public virtual void AddSpanQueries(SpanNearClauseFactory sncf)
{
VisitMatchingTerms(
sncf.IndexReader,
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Query/SimpleTermRewriteQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SimpleTermRewriteQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/SimpleTermRewriteQuery.cs
index 6502d6c..f2db8fb 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/SimpleTermRewriteQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/SimpleTermRewriteQuery.cs
@@ -24,7 +24,7 @@ namespace Lucene.Net.QueryParser.Surround.Query
internal class SimpleTermRewriteQuery : RewriteQuery<SimpleTerm>
{
- public SimpleTermRewriteQuery(
+ public SimpleTermRewriteQuery(
SimpleTerm srndQuery,
string fieldName,
BasicQueryFactory qf)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Query/SpanNearClauseFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SpanNearClauseFactory.cs b/src/Lucene.Net.QueryParser/Surround/Query/SpanNearClauseFactory.cs
index 6cddb9c..1465462 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/SpanNearClauseFactory.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/SpanNearClauseFactory.cs
@@ -76,7 +76,7 @@ namespace Lucene.Net.QueryParser.Surround.Query
AddSpanQueryWeighted((SpanQuery)q, q.Boost);
}
- public SpanQuery MakeSpanClause()
+ public virtual SpanQuery MakeSpanClause()
{
List<SpanQuery> spanQueries = new List<SpanQuery>();
foreach (var wsq in weightBySpanQuery)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Query/SrndBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SrndBooleanQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/SrndBooleanQuery.cs
index 7a1a8b3..fa61091 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/SrndBooleanQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/SrndBooleanQuery.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.QueryParser.Surround.Query
* limitations under the License.
*/
- public static class SrndBooleanQuery
+ internal class SrndBooleanQuery
{
public static void AddQueriesToBoolean(
BooleanQuery bq,
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.QueryParser/Surround/Query/SrndQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SrndQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/SrndQuery.cs
index 57b19cc..569db53 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/SrndQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/SrndQuery.cs
@@ -48,7 +48,6 @@ namespace Lucene.Net.QueryParser.Surround.Query
public virtual string WeightOperator { get { return "^"; } }
-
protected virtual void WeightToString(StringBuilder r)
{
/* append the weight part of a query */
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/387d985b/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
index 369fe92..b5ce3a7 100644
--- a/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
@@ -177,7 +177,7 @@ namespace Lucene.Net.QueryParser.Classic
: base(TEST_VERSION_CURRENT, "a", new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, false))
{}
- protected internal override Query HandleBareFuzzy(string qfield, Token fuzzySlop, string termImage)
+ internal override Query HandleBareFuzzy(string qfield, Token fuzzySlop, string termImage)
{
if (fuzzySlop.image.EndsWith("\u20ac"))
{