Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 44B85200B94 for ; Sun, 2 Oct 2016 12:22:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 43642160AD8; Sun, 2 Oct 2016 10:22:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 07E44160AEC for ; Sun, 2 Oct 2016 12:22:13 +0200 (CEST) Received: (qmail 83038 invoked by uid 500); 2 Oct 2016 10:22:13 -0000 Mailing-List: contact commits-help@lucenenet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucenenet.apache.org Delivered-To: mailing list commits@lucenenet.apache.org Received: (qmail 82797 invoked by uid 99); 2 Oct 2016 10:22:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Oct 2016 10:22:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CE886E188F; Sun, 2 Oct 2016 10:22:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: synhershko@apache.org To: commits@lucenenet.apache.org Date: Sun, 02 Oct 2016 10:22:21 -0000 Message-Id: <60dac5ff2b7c4b99813547b07a9ae5f7@git.apache.org> In-Reply-To: <2b14b0cab9144f78a565240604f99c29@git.apache.org> References: <2b14b0cab9144f78a565240604f99c29@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/12] lucenenet git commit: Changed all "String" references to "string" in QueryParser archived-at: Sun, 02 Oct 2016 10:22:15 -0000 Changed all "String" references to "string" in QueryParser Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/195bbfc7 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/195bbfc7 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/195bbfc7 Branch: refs/heads/master Commit: 195bbfc754731075f2ecb7fee325dba9bab09152 Parents: 97bd582 Author: Shad Storhaug Authored: Thu Sep 22 15:47:46 2016 +0700 Committer: Shad Storhaug Committed: Thu Sep 22 15:47:46 2016 +0700 ---------------------------------------------------------------------- src/Lucene.Net.QueryParser/Classic/CharStream.cs | 4 ++-- .../Classic/FastCharStream.cs | 2 +- .../Classic/MultiFieldQueryParser.cs | 12 ++++++------ .../Classic/ParseException.cs | 2 +- src/Lucene.Net.QueryParser/Classic/QueryParser.cs | 6 +++--- .../Classic/QueryParserBase.cs | 8 ++++---- .../Classic/QueryParserTokenManager.cs | 6 +++--- .../Ext/ExtendableQueryParser.cs | 2 +- src/Lucene.Net.QueryParser/Ext/Extensions.cs | 18 +++++++++--------- .../Surround/Parser/CharStream.cs | 4 ++-- .../Surround/Parser/FastCharStream.cs | 2 +- .../Surround/Parser/ParseException.cs | 2 +- .../Surround/Parser/QueryParser.cs | 4 ++-- .../Surround/Query/DistanceQuery.cs | 2 +- .../Surround/Query/RewriteQuery.cs | 2 +- .../Surround/Query/SrndPrefixQuery.cs | 2 +- 16 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/src/Lucene.Net.QueryParser/Classic/CharStream.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Classic/CharStream.cs b/src/Lucene.Net.QueryParser/Classic/CharStream.cs index 32294a8..7da1942 100644 --- a/src/Lucene.Net.QueryParser/Classic/CharStream.cs +++ b/src/Lucene.Net.QueryParser/Classic/CharStream.cs @@ -30,7 +30,7 @@ namespace Lucene.Net.QueryParsers.Classic /// All the methods except backup can be implemented in any fashion. backup /// needs to be implemented correctly for the correct operation of the lexer. /// Rest of the methods are all used to get information like line number, - /// column number and the String that constitutes a token and are not used + /// column number and the string that constitutes a token and are not used /// by the lexer. Hence their implementation won't affect the generated lexer's /// operation. /// @@ -117,7 +117,7 @@ namespace Lucene.Net.QueryParsers.Classic /// implementation of this is as follows : /// /// { - /// String t = GetImage(); + /// string t = GetImage(); /// return t.substring(t.length() - len, t.length()).toCharArray(); /// } /// http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs b/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs index c8c3204..954e425 100644 --- a/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs +++ b/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs @@ -103,7 +103,7 @@ namespace Lucene.Net.QueryParsers.Classic public string Image { - get { return new System.String(buffer, tokenStart, bufferPosition - tokenStart); } + get { return new string(buffer, tokenStart, bufferPosition - tokenStart); } } public char[] GetSuffix(int len) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/src/Lucene.Net.QueryParser/Classic/MultiFieldQueryParser.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Classic/MultiFieldQueryParser.cs b/src/Lucene.Net.QueryParser/Classic/MultiFieldQueryParser.cs index befda31..291f44c 100644 --- a/src/Lucene.Net.QueryParser/Classic/MultiFieldQueryParser.cs +++ b/src/Lucene.Net.QueryParser/Classic/MultiFieldQueryParser.cs @@ -36,7 +36,7 @@ namespace Lucene.Net.QueryParsers.Classic /// Boost, and the boost to apply to each term. /// ///

- /// It will, when parse(String query) is called, construct a query like this + /// It will, when parse(string query) is called, construct a query like this /// (assuming the query consists of two terms and you specify the two fields /// title and body): ///

@@ -76,7 +76,7 @@ namespace Lucene.Net.QueryParsers.Classic /// Creates a MultiFieldQueryParser. /// ///

- /// It will, when parse(String query) is called, construct a query like this + /// It will, when parse(string query) is called, construct a query like this /// (assuming the query consists of two terms and you specify the two fields /// title and body): ///

@@ -189,7 +189,7 @@ namespace Lucene.Net.QueryParsers.Classic return base.GetFuzzyQuery(field, termStr, minSimilarity); } - protected internal override Query GetPrefixQuery(System.String field, System.String termStr) + protected internal override Query GetPrefixQuery(string field, string termStr) { if (field == null) { @@ -296,7 +296,7 @@ namespace Lucene.Net.QueryParsers.Classic ///

/// Uasge: /// - /// String[] fields = {"filename", "contents", "description"}; + /// string[] fields = {"filename", "contents", "description"}; /// BooleanClause.Occur[] flags = {BooleanClause.Occur.SHOULD, /// BooleanClause.Occur.MUST, /// BooleanClause.Occur.MUST_NOT}; @@ -351,8 +351,8 @@ namespace Lucene.Net.QueryParsers.Classic ///

/// Usage: /// - /// String[] query = {"query1", "query2", "query3"}; - /// String[] fields = {"filename", "contents", "description"}; + /// string[] query = {"query1", "query2", "query3"}; + /// string[] fields = {"filename", "contents", "description"}; /// BooleanClause.Occur[] flags = {BooleanClause.Occur.SHOULD, /// BooleanClause.Occur.MUST, /// BooleanClause.Occur.MUST_NOT}; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/src/Lucene.Net.QueryParser/Classic/ParseException.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Classic/ParseException.cs b/src/Lucene.Net.QueryParser/Classic/ParseException.cs index 835c4f4..efd8c3f 100644 --- a/src/Lucene.Net.QueryParser/Classic/ParseException.cs +++ b/src/Lucene.Net.QueryParser/Classic/ParseException.cs @@ -217,7 +217,7 @@ namespace Lucene.Net.QueryParsers.Classic default: if ((ch = str[i]) < 0x20 || ch > 0x7e) { - System.String s = "0000" + System.Convert.ToString(ch, 16); + string s = "0000" + System.Convert.ToString(ch, 16); retval.Append("\\u" + s.Substring(s.Length - 4, (s.Length) - (s.Length - 4))); } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/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 64878e9..9781516 100644 --- a/src/Lucene.Net.QueryParser/Classic/QueryParser.cs +++ b/src/Lucene.Net.QueryParser/Classic/QueryParser.cs @@ -25,7 +25,7 @@ namespace Lucene.Net.QueryParsers.Classic */ ///

This class is generated by JavaCC. The most important method is - /// . + /// . /// /// The syntax for query strings is as follows: /// A Query is a series of clauses. @@ -67,7 +67,7 @@ namespace Lucene.Net.QueryParsers.Classic ///

/// The date resolution that shall be used for RangeQueries can be set /// using - /// or . The former + /// or . The former /// sets the default date resolution for all fields, whereas the latter can /// be used to set field specific date resolutions. Field specific date /// resolutions take, if set, precedence over the default date resolution. @@ -75,7 +75,7 @@ namespace Lucene.Net.QueryParsers.Classic ///

/// If you don't use in your index, you can create your own /// query parser that inherits QueryParser and overwrites - /// to + /// to /// use a different method for date conversion. ///

/// http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/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 68d1ef6..83e13a2 100644 --- a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs +++ b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs @@ -424,7 +424,7 @@ namespace Lucene.Net.QueryParsers.Classic /// /// throw in overridden method to disallow /// - protected internal virtual Query GetFieldQuery(String field, String queryText, int slop) + protected internal virtual Query GetFieldQuery(string field, string queryText, int slop) { Query query = GetFieldQuery(field, queryText, true); @@ -898,7 +898,7 @@ namespace Lucene.Net.QueryParsers.Classic } ///

- /// Returns a String where the escape char has been + /// Returns a string where the escape char has been /// removed, or kept only once if there was a double escape. /// /// Supports escaped unicode characters, e. g. translates @@ -979,7 +979,7 @@ namespace Lucene.Net.QueryParsers.Classic throw new ParseException("Term can not end with escape character."); } - return new String(output, 0, length); + return new string(output, 0, length); } /// @@ -1006,7 +1006,7 @@ namespace Lucene.Net.QueryParsers.Classic } /// - /// Returns a String where those characters that QueryParser + /// Returns a string where those characters that QueryParser /// expects to be escaped are escaped by a preceding \. /// public static string Escape(string s) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/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 409a33e..cc5191f 100644 --- a/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs +++ b/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs @@ -1204,12 +1204,12 @@ namespace Lucene.Net.QueryParsers.Classic protected internal virtual Token JjFillToken() { Token t; - System.String curTokenImage; + string curTokenImage; int beginLine; int endLine; int beginColumn; int endColumn; - System.String im = jjstrLiteralImages[jjmatchedKind]; + string im = jjstrLiteralImages[jjmatchedKind]; curTokenImage = (im == null)?input_stream.Image:im; beginLine = input_stream.BeginLine; beginColumn = input_stream.BeginColumn; @@ -1293,7 +1293,7 @@ namespace Lucene.Net.QueryParsers.Classic } int error_line = input_stream.EndLine; int error_column = input_stream.EndColumn; - System.String error_after = null; + string error_after = null; bool EOFSeen = false; try { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/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 b33ce13..08538a2 100644 --- a/src/Lucene.Net.QueryParser/Ext/ExtendableQueryParser.cs +++ b/src/Lucene.Net.QueryParser/Ext/ExtendableQueryParser.cs @@ -30,7 +30,7 @@ namespace Lucene.Net.QueryParsers.Ext /// keys into the field symbol associated with a registered instance of /// . A customizable separation character separates the /// extension key from the actual field symbol. The - /// splits () the + /// splits () the /// extension key from the field symbol and tries to resolve the associated /// . If the parser can't resolve the key or the field /// token does not contain a separation character, http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/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 f441850..e64c809 100644 --- a/src/Lucene.Net.QueryParser/Ext/Extensions.cs +++ b/src/Lucene.Net.QueryParser/Ext/Extensions.cs @@ -83,7 +83,7 @@ namespace Lucene.Net.QueryParsers.Ext /// /// Splits a extension field and returns the field / extension part as a - /// . This method tries to split on the first occurrence of the + /// . This method tries to split on the first occurrence of the /// extension field delimiter, if the delimiter is not present in the string /// the result will contain a null value for the extension key and /// the given field string as the field value. If the given extension field @@ -92,8 +92,8 @@ namespace Lucene.Net.QueryParsers.Ext /// /// the default query field /// the extension field string - /// a { with the field name as the and the - /// extension key as the + /// a { with the field name as the and the + /// extension key as the public virtual Tuple SplitExtensionField(string defaultField, string field) { int indexOf = field.IndexOf(this.extensionFieldDelimiter); @@ -106,7 +106,7 @@ namespace Lucene.Net.QueryParsers.Ext /// /// Escapes an extension field. The default implementation is equivalent to - /// . + /// . /// /// the extension field identifier /// the extension field identifier with all special chars escaped with @@ -125,8 +125,8 @@ namespace Lucene.Net.QueryParsers.Ext /// beginning. Special Query characters are escaped in the result. ///

/// Note: subclasses must maintain the contract between - /// and - /// where the latter inverts the + /// and + /// where the latter inverts the /// former. ///

/// @@ -146,14 +146,14 @@ namespace Lucene.Net.QueryParsers.Ext /// beginning. Special Query characters are escaped in the result. ///

/// Note: subclasses must maintain the contract between - /// and - /// where the latter inverts the + /// and + /// where the latter inverts the /// former. ///

/// the extension key /// the field to apply the extension on. /// escaped extension field identifier - /// See to use the default query field + /// See to use the default query field public virtual string BuildExtensionField(string extensionKey, string field) { StringBuilder builder = new StringBuilder(field); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs b/src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs index 386c9ad..8136f0f 100644 --- a/src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs +++ b/src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs @@ -30,7 +30,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser /// All the methods except backup can be implemented in any fashion. backup /// needs to be implemented correctly for the correct operation of the lexer. /// Rest of the methods are all used to get information like line number, - /// column number and the String that constitutes a token and are not used + /// column number and the string that constitutes a token and are not used /// by the lexer. Hence their implementation won't affect the generated lexer's /// operation. /// @@ -117,7 +117,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser /// implementation of this is as follows : /// /// { - /// String t = GetImage(); + /// string t = GetImage(); /// return t.substring(t.length() - len, t.length()).toCharArray(); /// } /// http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs b/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs index 16a548e..24a7102 100644 --- a/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs +++ b/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs @@ -103,7 +103,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser public string Image { - get { return new System.String(buffer, tokenStart, bufferPosition - tokenStart); } + get { return new string(buffer, tokenStart, bufferPosition - tokenStart); } } public char[] GetSuffix(int len) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/src/Lucene.Net.QueryParser/Surround/Parser/ParseException.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/ParseException.cs b/src/Lucene.Net.QueryParser/Surround/Parser/ParseException.cs index 4b1e7f2..6f7ed81 100644 --- a/src/Lucene.Net.QueryParser/Surround/Parser/ParseException.cs +++ b/src/Lucene.Net.QueryParser/Surround/Parser/ParseException.cs @@ -217,7 +217,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser default: if ((ch = str[i]) < 0x20 || ch > 0x7e) { - System.String s = "0000" + System.Convert.ToString(ch, 16); + string s = "0000" + System.Convert.ToString(ch, 16); retval.Append("\\u" + s.Substring(s.Length - 4, (s.Length) - (s.Length - 4))); } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs index afdfc64..bdab9ca 100644 --- a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs +++ b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs @@ -142,12 +142,12 @@ namespace Lucene.Net.QueryParsers.Surround.Parser } protected virtual SrndQuery GetTermQuery( - String term, bool quoted) + string term, bool quoted) { return new SrndTermQuery(term, quoted); } - protected virtual bool AllowedSuffix(String suffixed) + protected virtual bool AllowedSuffix(string suffixed) { return (suffixed.Length - 1) >= minimumPrefixLength; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/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 7e4217d..5169343 100644 --- a/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs +++ b/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs @@ -80,7 +80,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query public virtual Search.Query GetSpanNearQuery( IndexReader reader, - String fieldName, + string fieldName, float boost, BasicQueryFactory qf) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/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 fe41d5c..89b8459 100644 --- a/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs +++ b/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs @@ -28,7 +28,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query public RewriteQuery( SQ srndQuery, - String fieldName, + string fieldName, BasicQueryFactory qf) { this.srndQuery = srndQuery; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/195bbfc7/src/Lucene.Net.QueryParser/Surround/Query/SrndPrefixQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SrndPrefixQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/SrndPrefixQuery.cs index 6f850e0..cffa38a 100644 --- a/src/Lucene.Net.QueryParser/Surround/Query/SrndPrefixQuery.cs +++ b/src/Lucene.Net.QueryParser/Surround/Query/SrndPrefixQuery.cs @@ -22,7 +22,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query */ /// - /// Query that matches String prefixes + /// Query that matches string prefixes /// public class SrndPrefixQuery : SimpleTerm {