lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [26/58] lucenenet git commit: QueryParser.Flexible refactor: Formatting, removed commented code, changed some properties
Date Tue, 06 Dec 2016 15:12:01 GMT
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BooleanQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BooleanQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BooleanQueryNodeBuilder.cs
index 8aae6e7..074ae2b 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BooleanQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BooleanQueryNodeBuilder.cs
@@ -30,7 +30,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             BooleanQueryNode booleanNode = (BooleanQueryNode)queryNode;
@@ -40,7 +39,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             if (children != null)
             {
-
                 foreach (IQueryNode child in children)
                 {
                     object obj = child.GetTag(QueryTreeBuilder<Query>.QUERY_TREE_BUILDER_TAGID);
@@ -52,45 +50,28 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
                         try
                         {
                             bQuery.Add(query, GetModifierValue(child));
-
                         }
                         catch (BooleanQuery.TooManyClauses ex)
                         {
-
                             throw new QueryNodeException(new MessageImpl(
                                 QueryParserMessages.TOO_MANY_BOOLEAN_CLAUSES, BooleanQuery
                                     .MaxClauseCount, queryNode
                                     .ToQueryString(new EscapeQuerySyntaxImpl())), ex);
-
                         }
-
                     }
-
                 }
-
             }
 
             return bQuery;
-
         }
 
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
-
         private static BooleanClause.Occur GetModifierValue(IQueryNode node)
         {
-
             if (node is ModifierQueryNode)
             {
                 ModifierQueryNode mNode = ((ModifierQueryNode)node);
                 switch (mNode.Modifier)
                 {
-
                     case Modifier.MOD_REQ:
                         return BooleanClause.Occur.MUST;
 
@@ -99,14 +80,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
                     case Modifier.MOD_NONE:
                         return BooleanClause.Occur.SHOULD;
-
                 }
-
             }
 
             return BooleanClause.Occur.SHOULD;
-
         }
-
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BoostQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BoostQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BoostQueryNodeBuilder.cs
index 4021391..a61e651 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BoostQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BoostQueryNodeBuilder.cs
@@ -37,15 +37,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             query.Boost = boostNode.Value;
 
             return query;
-
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/DummyQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/DummyQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/DummyQueryNodeBuilder.cs
index 1587559..4a25991 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/DummyQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/DummyQueryNodeBuilder.cs
@@ -34,13 +34,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
         {
             return null;
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FieldQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FieldQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FieldQueryNodeBuilder.cs
index 8393826..60b83b9 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FieldQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FieldQueryNodeBuilder.cs
@@ -20,7 +20,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             FieldQueryNode fieldNode = (FieldQueryNode)queryNode;
@@ -28,13 +27,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             return new TermQuery(new Term(fieldNode.GetFieldAsString(), fieldNode
                 .GetTextAsString()));
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FuzzyQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FuzzyQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FuzzyQueryNodeBuilder.cs
index bba33b4..b64c9e9 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FuzzyQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FuzzyQueryNodeBuilder.cs
@@ -21,28 +21,17 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             FuzzyQueryNode fuzzyNode = (FuzzyQueryNode)queryNode;
             string text = fuzzyNode.GetTextAsString();
 
-
             int numEdits = FuzzyQuery.FloatToEdits(fuzzyNode.Similarity,
                 text.CodePointCount(0, text.Length));
 
             return new FuzzyQuery(new Term(fuzzyNode.GetFieldAsString(), fuzzyNode
                 .GetTextAsString()), numEdits, fuzzyNode
                 .PrefixLength);
-
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/GroupQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/GroupQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/GroupQueryNodeBuilder.cs
index af8d121..5adf2f3 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/GroupQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/GroupQueryNodeBuilder.cs
@@ -21,22 +21,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             GroupQueryNode groupNode = (GroupQueryNode)queryNode;
 
             return (Query)(groupNode).GetChild().GetTag(
                 QueryTreeBuilder<Query>.QUERY_TREE_BUILDER_TAGID);
-
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MatchAllDocsQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MatchAllDocsQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MatchAllDocsQueryNodeBuilder.cs
index 0a9dfec..d6c9784 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MatchAllDocsQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MatchAllDocsQueryNodeBuilder.cs
@@ -24,10 +24,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
-
             // validates node
             if (!(queryNode is MatchAllDocsQueryNode))
             {
@@ -38,15 +36,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             }
 
             return new MatchAllDocsQuery();
-
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MatchNoDocsQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MatchNoDocsQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MatchNoDocsQueryNodeBuilder.cs
index 25f5d6b..62646a4 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MatchNoDocsQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MatchNoDocsQueryNodeBuilder.cs
@@ -24,10 +24,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
-
             // validates node
             if (!(queryNode is MatchNoDocsQueryNode))
             {
@@ -38,16 +36,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             }
 
             return new BooleanQuery();
-
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
-
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/ModifierQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/ModifierQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/ModifierQueryNodeBuilder.cs
index 271ebca..73b542a 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/ModifierQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/ModifierQueryNodeBuilder.cs
@@ -21,22 +21,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             ModifierQueryNode modifierNode = (ModifierQueryNode)queryNode;
 
             return (Query)(modifierNode).GetChild().GetTag(
                 QueryTreeBuilder<Query>.QUERY_TREE_BUILDER_TAGID);
-
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MultiPhraseQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MultiPhraseQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MultiPhraseQueryNodeBuilder.cs
index e0eea41..1d7f243 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MultiPhraseQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MultiPhraseQueryNodeBuilder.cs
@@ -23,7 +23,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             MultiPhraseQueryNode phraseNode = (MultiPhraseQueryNode)queryNode;
@@ -34,7 +33,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             if (children != null)
             {
-                //TreeDictionary<int?, List<Term>> positionTermMap = new TreeDictionary<int?, List<Term>>();
                 IDictionary<int?, List<Term>> positionTermMap = new SortedDictionary<int?, List<Term>>();
 
                 foreach (IQueryNode child in children)
@@ -43,18 +41,14 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
                     TermQuery termQuery = (TermQuery)termNode
                         .GetTag(QueryTreeBuilder<Query>.QUERY_TREE_BUILDER_TAGID);
 
-                    //List<Term> termList = positionTermMap[termNode.GetPositionIncrement()];
-                    //if (termList == null)
                     List<Term> termList;
                     if (!positionTermMap.TryGetValue(termNode.PositionIncrement, out termList) || termList == null)
                     {
                         termList = new List<Term>();
                         positionTermMap[termNode.PositionIncrement] = termList;
-
                     }
 
                     termList.Add(termQuery.Term);
-
                 }
 
                 foreach (int positionIncrement in positionTermMap.Keys)
@@ -63,21 +57,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
                     phraseQuery.Add(termList.ToArray(/*new Term[termList.size()]*/),
                                 positionIncrement);
-
                 }
-
             }
 
             return phraseQuery;
-
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/NumericRangeQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/NumericRangeQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/NumericRangeQueryNodeBuilder.cs
index b616069..e519eda 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/NumericRangeQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/NumericRangeQueryNodeBuilder.cs
@@ -31,7 +31,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             NumericRangeQueryNode numericRangeNode = (NumericRangeQueryNode)queryNode;
@@ -53,7 +52,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             switch (numberType)
             {
-
                 case FieldType.NumericType.LONG:
                     return NumericRangeQuery.NewLongRange(field, precisionStep,
                         (long?)lowerNumber, (long?)upperNumber, minInclusive, maxInclusive);
@@ -76,16 +74,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
                 default:
                     throw new QueryNodeException(new MessageImpl(
                       QueryParserMessages.UNSUPPORTED_NUMERIC_DATA_TYPE, numberType));
-
             }
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PhraseQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PhraseQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PhraseQueryNodeBuilder.cs
index 3683797..757e7cf 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PhraseQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PhraseQueryNodeBuilder.cs
@@ -20,7 +20,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             TokenizedPhraseQueryNode phraseNode = (TokenizedPhraseQueryNode)queryNode;
@@ -31,7 +30,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             if (children != null)
             {
-
                 foreach (IQueryNode child in children)
                 {
                     TermQuery termQuery = (TermQuery)child
@@ -39,21 +37,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
                     FieldQueryNode termNode = (FieldQueryNode)child;
 
                     phraseQuery.Add(termQuery.Term, termNode.PositionIncrement);
-
                 }
-
             }
 
             return phraseQuery;
-
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PrefixWildcardQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PrefixWildcardQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PrefixWildcardQueryNodeBuilder.cs
index 137c952..8524cc2 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PrefixWildcardQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PrefixWildcardQueryNodeBuilder.cs
@@ -23,10 +23,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
-
             PrefixWildcardQueryNode wildcardNode = (PrefixWildcardQueryNode)queryNode;
 
             string text = wildcardNode.Text.SubSequence(0, wildcardNode.Text.Length - 1).ToString();
@@ -40,13 +38,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             return q;
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/RegexpQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/RegexpQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/RegexpQueryNodeBuilder.cs
index 1811d76..764931e 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/RegexpQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/RegexpQueryNodeBuilder.cs
@@ -22,7 +22,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             RegexpQueryNode regexpNode = (RegexpQueryNode)queryNode;
@@ -39,13 +38,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             return q;
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/SlopQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/SlopQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/SlopQueryNodeBuilder.cs
index 13d1fa0..7497aab 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/SlopQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/SlopQueryNodeBuilder.cs
@@ -22,7 +22,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             SlopQueryNode phraseSlopNode = (SlopQueryNode)queryNode;
@@ -33,7 +32,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             if (query is PhraseQuery)
             {
                 ((PhraseQuery)query).Slop = phraseSlopNode.Value;
-
             }
             else
             {
@@ -41,15 +39,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             }
 
             return query;
-
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardBooleanQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardBooleanQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardBooleanQueryNodeBuilder.cs
index 57f8b14..76b601b 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardBooleanQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardBooleanQueryNodeBuilder.cs
@@ -29,7 +29,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             StandardBooleanQueryNode booleanNode = (StandardBooleanQueryNode)queryNode;
@@ -39,7 +38,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             if (children != null)
             {
-
                 foreach (IQueryNode child in children)
                 {
                     object obj = child.GetTag(QueryTreeBuilder<Query>.QUERY_TREE_BUILDER_TAGID);
@@ -54,35 +52,20 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
                         }
                         catch (BooleanQuery.TooManyClauses ex)
                         {
-
                             throw new QueryNodeException(new MessageImpl(
                                 QueryParserMessages.TOO_MANY_BOOLEAN_CLAUSES, BooleanQuery
                                     .MaxClauseCount, queryNode
                                     .ToQueryString(new EscapeQuerySyntaxImpl())), ex);
-
                         }
-
                     }
-
                 }
-
             }
 
             return bQuery;
-
         }
 
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
-
         private static BooleanClause.Occur GetModifierValue(IQueryNode node)
         {
-
             if (node is ModifierQueryNode)
             {
                 ModifierQueryNode mNode = ((ModifierQueryNode)node);
@@ -91,12 +74,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
                 if (Modifier.MOD_NONE.Equals(modifier))
                 {
                     return BooleanClause.Occur.SHOULD;
-
                 }
                 else if (Modifier.MOD_NOT.Equals(modifier))
                 {
                     return BooleanClause.Occur.MUST_NOT;
-
                 }
                 else
                 {
@@ -105,8 +86,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             }
 
             return BooleanClause.Occur.SHOULD;
-
         }
-
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardQueryTreeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardQueryTreeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardQueryTreeBuilder.cs
index a99ae45..7971930 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardQueryTreeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardQueryTreeBuilder.cs
@@ -42,19 +42,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
                 new StandardBooleanQueryNodeBuilder());
             SetBuilder(typeof(MultiPhraseQueryNode), new MultiPhraseQueryNodeBuilder());
             SetBuilder(typeof(MatchAllDocsQueryNode), new MatchAllDocsQueryNodeBuilder());
-
         }
 
-        public override /*object*/ Query Build(IQueryNode queryNode)
+        public override Query Build(IQueryNode queryNode)
         {
             return base.Build(queryNode);
         }
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IStandardQueryBuilder
-        ///// </summary>
-        //Query IStandardQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return (Query)Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/TermRangeQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/TermRangeQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/TermRangeQueryNodeBuilder.cs
index 965394e..7899c06 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/TermRangeQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/TermRangeQueryNodeBuilder.cs
@@ -23,7 +23,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             TermRangeQueryNode rangeNode = (TermRangeQueryNode)queryNode;
@@ -55,15 +54,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             }
 
             return rangeQuery;
-
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/WildcardQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/WildcardQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/WildcardQueryNodeBuilder.cs
index 4817427..15294f7 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/WildcardQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/WildcardQueryNodeBuilder.cs
@@ -23,7 +23,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             // empty constructor
         }
 
-
         public virtual Query Build(IQueryNode queryNode)
         {
             WildcardQueryNode wildcardNode = (WildcardQueryNode)queryNode;
@@ -39,13 +38,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             return q;
         }
-
-        ///// <summary>
-        ///// LUCENENET specific overload for supporting IQueryBuilder
-        ///// </summary>
-        //object IQueryBuilder.Build(IQueryNode queryNode)
-        //{
-        //    return Build(queryNode);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldBoostMapFCListener.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldBoostMapFCListener.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldBoostMapFCListener.cs
index 6758c8f..278e26f 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldBoostMapFCListener.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldBoostMapFCListener.cs
@@ -26,21 +26,17 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
             this.config = config;
         }
 
-
         public virtual void BuildFieldConfig(FieldConfig fieldConfig)
         {
             IDictionary<string, float?> fieldBoostMap = this.config.Get(ConfigurationKeys.FIELD_BOOST_MAP);
 
             if (fieldBoostMap != null)
             {
-                float? boost;// = fieldBoostMap.Get(fieldConfig.GetField());
-                fieldBoostMap.TryGetValue(fieldConfig.Field, out boost);
-
-                if (boost != null)
+                float? boost;
+                if (fieldBoostMap.TryGetValue(fieldConfig.Field, out boost) && boost != null)
                 {
                     fieldConfig.Set(ConfigurationKeys.BOOST, boost);
                 }
-
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldDateResolutionFCListener.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldDateResolutionFCListener.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldDateResolutionFCListener.cs
index edfdb4d..35c9b05 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldDateResolutionFCListener.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldDateResolutionFCListener.cs
@@ -27,7 +27,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
             this.config = config;
         }
 
-        
         public virtual void BuildFieldConfig(FieldConfig fieldConfig)
         {
             DateTools.Resolution? dateRes = null;
@@ -36,9 +35,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
             if (dateResMap != null)
             {
                 dateResMap.TryGetValue(fieldConfig.Field, out dateRes);
-
-                //dateRes = dateResMap.Get(
-                //    fieldConfig.GetField());
             }
 
             if (dateRes == null)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumberDateFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumberDateFormat.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumberDateFormat.cs
index fc821eb..f0fcd35 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumberDateFormat.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumberDateFormat.cs
@@ -12,7 +12,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
     /// <summary>
     /// LUCENENET specific enum for mimicking the Java DateFormat
     /// </summary>
-    public enum DateStyle
+    public enum DateFormat
     {
         FULL, LONG,
         MEDIUM, SHORT
@@ -28,12 +28,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
         //private static readonly long serialVersionUID = 964823936071308283L;
 
         // The .NET ticks representing January 1, 1970 0:00:00, also known as the "epoch".
-        private const long EPOCH = 621355968000000000;
+        public const long EPOCH = 621355968000000000;
 
-        //private readonly DateFormat dateFormat;
-        private readonly DateStyle dateStyle;
-        private readonly DateStyle timeStyle;
-        //private readonly CultureInfo locale;
+        private readonly string dateFormat;
+        private readonly DateFormat dateStyle;
+        private readonly DateFormat timeStyle;
         private readonly TimeZoneInfo timeZone;
 
         /**
@@ -41,105 +40,77 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
          * 
          * @param dateFormat {@link DateFormat} used to parse and format dates
          */
-        //public NumberDateFormat(DateFormat dateFormat)
-        //{
-        //    this.dateFormat = dateFormat;
-        //}
-
-        //public NumberDateFormat(string dateFormat, CultureInfo locale)
-        //{
-        //    this.dateFormat = dateFormat;
-        //    this.locale = locale;
-        //}
-
-        //public NumberDateFormat(string dateFormat)
-        //    : this(dateFormat, CultureInfo.CurrentCulture)
-        //{
-        //}
+        public NumberDateFormat(string dateFormat, CultureInfo locale)
+            : base(locale)
+        {
+            this.dateFormat = dateFormat;
+        }
 
-        public NumberDateFormat(DateStyle dateStyle, DateStyle timeStyle, CultureInfo locale, TimeZoneInfo timeZone)
+        public NumberDateFormat(DateFormat dateStyle, DateFormat timeStyle, CultureInfo locale, TimeZoneInfo timeZone)
             : base(locale)
         {
             this.dateStyle = dateStyle;
             this.timeStyle = timeStyle;
-            //this.locale = locale;
             this.timeZone = timeZone;
         }
 
         public override string Format(double number)
         {
-            //long ticks = (long)number + EPOCH;
-            //return new DateTime(ticks).ToString(GetDateFormat(), this.locale);
-
             return new DateTime(EPOCH).AddMilliseconds(number).ToString(GetDateFormat(), this.locale);
         }
 
-
         public override string Format(long number)
         {
-            //long ticks = number + EPOCH;
-            //return new DateTime(ticks).ToString(GetDateFormat(), this.locale);
-
             return new DateTime(EPOCH).AddMilliseconds(number).ToString(GetDateFormat(), this.locale);
         }
 
-
-        public override /*Number*/ object Parse(string source)
+        public override object Parse(string source)
         {
             return (DateTime.Parse(source, this.locale) - new DateTime(EPOCH)).TotalMilliseconds;
-
-            //DateTime date = DateTime.Parse(source, this.locale);
-            //return date.Ticks - EPOCH;
-
-            //DateTime date = dateFormat.parse(source, parsePosition);
-            //return (date == null) ? null : date.getTime();
         }
 
-
         public override string Format(object number)
         {
-            //long ticks = Convert.ToInt64(number) + EPOCH;
-            //return new DateTime(ticks).ToString(GetDateFormat(), this.locale);
-
             return new DateTime(EPOCH).AddMilliseconds(Convert.ToInt64(number)).ToString(GetDateFormat(), this.locale);
         }
 
-
-        private string GetDateFormat()
+        internal string GetDateFormat()
         {
+            if (dateFormat != null) return dateFormat;
+
             string datePattern = "", timePattern = "";
 
             switch (dateStyle)
             {
-                case DateStyle.SHORT:
+                case DateFormat.SHORT:
                     datePattern = locale.DateTimeFormat.ShortDatePattern;
                     break;
-                case DateStyle.MEDIUM:
+                case DateFormat.MEDIUM:
                     datePattern = locale.DateTimeFormat.LongDatePattern
                         .Replace("dddd,", "").Replace(", dddd", "") // Remove the day of the week
                         .Replace("MMMM", "MMM"); // Replace month with abbreviated month
                     break;
-                case DateStyle.LONG:
+                case DateFormat.LONG:
                     datePattern = locale.DateTimeFormat.LongDatePattern
                         .Replace("dddd,", "").Replace(", dddd", ""); // Remove the day of the week
                     break;
-                case DateStyle.FULL:
+                case DateFormat.FULL:
                     datePattern = locale.DateTimeFormat.LongDatePattern;
                     break;
             }
 
             switch (timeStyle)
             {
-                case DateStyle.SHORT:
+                case DateFormat.SHORT:
                     timePattern = locale.DateTimeFormat.ShortTimePattern;
                     break;
-                case DateStyle.MEDIUM:
+                case DateFormat.MEDIUM:
                     timePattern = locale.DateTimeFormat.LongTimePattern;
                     break;
-                case DateStyle.LONG:
+                case DateFormat.LONG:
                     timePattern = locale.DateTimeFormat.LongTimePattern; // LUCENENET TODO: Time zone info not being added
                     break;
-                case DateStyle.FULL:
+                case DateFormat.FULL:
                     timePattern = locale.DateTimeFormat.LongTimePattern; // LUCENENET TODO: Time zone info not being added, but Java doc is unclear on what the difference is between this and LONG
                     break;
             }
@@ -148,63 +119,3 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
         }
     }
 }
-
-
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using System.Threading.Tasks;
-
-//namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
-//{
-//    /// <summary>
-//    /// This {@link Format} parses {@link Long} into date strings and vice-versa. It
-//    /// uses the given {@link DateFormat} to parse and format dates, but before, it
-//    /// converts {@link Long} to {@link Date} objects or vice-versa.
-//    /// </summary>
-//    public class NumberDateFormat : NumberFormat
-//    {
-//        //private static readonly long serialVersionUID = 964823936071308283L;
-
-//        private readonly DateFormat dateFormat;
-
-//        /**
-//         * Constructs a {@link NumberDateFormat} object using the given {@link DateFormat}.
-//         * 
-//         * @param dateFormat {@link DateFormat} used to parse and format dates
-//         */
-//        public NumberDateFormat(DateFormat dateFormat)
-//        {
-//            this.dateFormat = dateFormat;
-//        }
-
-
-//        public override StringBuilder format(double number, StringBuilder toAppendTo,
-//            FieldPosition pos)
-//        {
-//            return dateFormat.format(new Date((long)number), toAppendTo, pos);
-//        }
-
-
-//        public override StringBuilder format(long number, StringBuilder toAppendTo,
-//            FieldPosition pos)
-//        {
-//            return dateFormat.format(new Date(number), toAppendTo, pos);
-//        }
-
-
-//        public override /*Number*/ object Parse(string source, ParsePosition parsePosition)
-//        {
-//            DateTime date = dateFormat.parse(source, parsePosition);
-//            return (date == null) ? null : date.getTime();
-//        }
-
-
-//        public override StringBuffer format(object number, StringBuilder toAppendTo,
-//            FieldPosition pos)
-//        {
-//            return dateFormat.format(number, toAppendTo, pos);
-//        }
-//    }
-//}

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericConfig.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericConfig.cs
index 280fe1f..33acddb 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericConfig.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericConfig.cs
@@ -92,7 +92,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
 
         public override bool Equals(object obj)
         {
-
             if (obj == this) return true;
 
             if (obj is NumericConfig)
@@ -105,11 +104,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
                 {
                     return true;
                 }
-
             }
 
             return false;
-
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericFieldConfigListener.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericFieldConfigListener.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericFieldConfigListener.cs
index b419bc6..62d7e5f 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericFieldConfigListener.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericFieldConfigListener.cs
@@ -43,12 +43,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
 
             if (numericConfigMap != null)
             {
-                //NumericConfig numericConfig = numericConfigMap
-                //    .Get(fieldConfig.GetField());
                 NumericConfig numericConfig;
-
-
-                //if (numericConfig != null)
                 if (numericConfigMap.TryGetValue(fieldConfig.Field, out numericConfig) && numericConfig != null)
                 {
                     fieldConfig.Set(ConfigurationKeys.NUMERIC_CONFIG, numericConfig);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs
index ddfad70..93f9d42 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs
@@ -9,7 +9,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using static Lucene.Net.QueryParsers.Flexible.Standard.Config.StandardQueryConfigHandler;
+using Operator = Lucene.Net.QueryParsers.Flexible.Standard.Config.StandardQueryConfigHandler.Operator;
 
 namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
 {
@@ -22,8 +22,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
     /// <seealso cref="StandardQueryNodeProcessorPipeline"/>
     public class StandardQueryConfigHandler : QueryConfigHandler
     {
-        
-
         public StandardQueryConfigHandler()
         {
             // Add listener that will build the FieldConfig.
@@ -43,7 +41,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
             Set(ConfigurationKeys.LOCALE, CultureInfo.InvariantCulture);
             Set(ConfigurationKeys.MULTI_TERM_REWRITE_METHOD, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT);
             Set(ConfigurationKeys.FIELD_DATE_RESOLUTION_MAP, new HashMap<string, DateTools.Resolution?>());
-
         }
 
         /**
@@ -61,7 +58,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
    */
     public sealed class ConfigurationKeys
     {
-
         /**
          * Key used to set whether position increments is enabled
          * 
@@ -195,6 +191,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
          * @see StandardQueryParser#getNumericConfigMap()
          */
         public readonly static ConfigurationKey<IDictionary<string, NumericConfig>> NUMERIC_CONFIG_MAP = ConfigurationKey.NewInstance<IDictionary<string, NumericConfig>>();
-
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/AbstractRangeQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/AbstractRangeQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/AbstractRangeQueryNode.cs
index 33c5fab..108ee69 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/AbstractRangeQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/AbstractRangeQueryNode.cs
@@ -24,7 +24,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
          */
         protected AbstractRangeQueryNode()
         {
-            SetLeaf(false);
+            IsLeaf = false;
             Allocate();
         }
 
@@ -74,29 +74,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         }
 
         /**
-         * Sets the field associated with this node.
-         * 
-         * @param fieldName the field associated with this node
-         */
-        //      @Override
-        //public void setField(CharSequence fieldName)
-        //      {
-        //          T lower = getLowerBound();
-        //          T upper = getUpperBound();
-
-        //          if (lower != null)
-        //          {
-        //              lower.setField(fieldName);
-        //          }
-
-        //          if (upper != null)
-        //          {
-        //              upper.setField(fieldName);
-        //          }
-
-        //      }
-
-        /**
          * Returns the lower bound node.
          * 
          * @return the lower bound node.
@@ -153,7 +130,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         public virtual void SetBounds(T lower, T upper, bool lowerInclusive,
             bool upperInclusive)
         {
-
             if (lower != null && upper != null)
             {
                 string lowerField = StringUtils.ToString(lower.Field);
@@ -175,12 +151,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
                 children.Add(upper);
 
                 Set(children);
-
             }
-
         }
 
-
         public override string ToQueryString(IEscapeQuerySyntax escapeSyntaxParser)
         {
             StringBuilder sb = new StringBuilder();
@@ -191,7 +164,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             if (lowerInclusive)
             {
                 sb.Append('[');
-
             }
             else
             {
@@ -201,7 +173,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             if (lower != null)
             {
                 sb.Append(lower.ToQueryString(escapeSyntaxParser));
-
             }
             else
             {
@@ -213,7 +184,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             if (upper != null)
             {
                 sb.Append(upper.ToQueryString(escapeSyntaxParser));
-
             }
             else
             {
@@ -223,7 +193,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             if (upperInclusive)
             {
                 sb.Append(']');
-
             }
             else
             {
@@ -231,10 +200,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             }
 
             return sb.ToString();
-
         }
 
-
         public override string ToString()
         {
             StringBuilder sb = new StringBuilder("<").Append(GetType().AssemblyQualifiedName);
@@ -246,7 +213,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             sb.Append("</").Append(GetType().AssemblyQualifiedName).Append(">\n");
 
             return sb.ToString();
-
         }
     }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/MultiPhraseQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/MultiPhraseQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/MultiPhraseQueryNode.cs
index 83b23bd..57bf1b8 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/MultiPhraseQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/MultiPhraseQueryNode.cs
@@ -16,9 +16,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
     {
         public MultiPhraseQueryNode()
         {
-            SetLeaf(false);
+            IsLeaf = false;
             Allocate();
-
         }
 
         public override string ToString()
@@ -37,7 +36,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             return sb.ToString();
         }
 
-
         public override string ToQueryString(IEscapeQuerySyntax escapeSyntaxParser)
         {
             var children = GetChildren();
@@ -55,7 +53,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             return "[MTP[" + sb.ToString() + "]]";
         }
 
-
         public override IQueryNode CloneTree()
         {
             MultiPhraseQueryNode clone = (MultiPhraseQueryNode)base.CloneTree();
@@ -65,7 +62,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             return clone;
         }
 
-
         public virtual string Field
         {
             get
@@ -75,7 +71,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
                 if (children == null || children.Count == 0)
                 {
                     return null;
-
                 }
                 else
                 {
@@ -88,19 +83,15 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
 
                 if (children != null)
                 {
-
                     foreach (IQueryNode child in children)
                     {
-
                         if (child is IFieldableNode)
                         {
                             ((IFieldableNode)child).Field = value;
                         }
-
                     }
                 }
             }
-
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericQueryNode.cs
index b3f55fc..096b802 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericQueryNode.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         }
 
         /**
-         * Returns the field associated with this node.
+         * Gets or Sets the field associated with this node.
          * 
          * @return the field associated with this node
          */
@@ -56,17 +56,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         }
 
         /**
-         * Sets the field associated with this node.
-         * 
-         * @param fieldName the field associated with this node
-         */
-        //      @Override
-        //public void setField(CharSequence fieldName)
-        //      {
-        //          this.field = fieldName;
-        //      }
-
-        /**
          * This method is used to get the value converted to {@link String} and
          * escaped using the given {@link EscapeQuerySyntax}.
          * 
@@ -76,9 +65,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
          */
         protected string GetTermEscaped(IEscapeQuerySyntax escaper)
         {
-            //return escaper.Escape(new StringCharSequenceWrapper(/*string.Format(numberFormat, this.value))*/ numberFormat.Format(this.value),
-            //    CultureInfo.CurrentCulture, EscapeQuerySyntax.Type.NORMAL).ToString();
-
             return escaper.Escape(numberFormat.Format(this.value),
                 CultureInfo.CurrentCulture, EscapeQuerySyntax.Type.NORMAL);
         }
@@ -112,25 +98,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
          * 
          * @return the numeric value
          */
-
         public virtual object Value
         {
             get { return value; }
             set { this.value = value; }
         }
 
-        /**
-         * Sets the numeric value.
-         * 
-         * @param value the numeric value
-         */
-        //      @Override
-        //public void setValue(Number value)
-        //      {
-        //          this.value = value;
-        //      }
-
-
         public override string ToString()
         {
             return "<numeric field='" + this.field + "' number='"

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs
index 64d09cf..160b581 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using static Lucene.Net.Documents.FieldType;
+using NumericType = Lucene.Net.Documents.FieldType.NumericType;
 
 namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
 {
@@ -41,7 +41,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
 
         private static NumericType GetNumericDataType(/*Number*/ object number)
         {
-
             if (number is long)
             {
                 return NumericType.LONG;
@@ -65,7 +64,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
                         QueryParserMessages.NUMBER_CLASS_NOT_SUPPORTED_BY_NUMERIC_RANGE_QUERY,
                         number.GetType()));
             }
-
         }
 
         /**
@@ -126,7 +124,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
 
             base.SetBounds(lower, upper, lowerInclusive, upperInclusive);
             this.numericConfig = numericConfig;
-
         }
 
         /**
@@ -139,7 +136,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             get { return this.numericConfig; }
         }
 
-
         public override string ToString()
         {
             StringBuilder sb = new StringBuilder("<numericRange lowerInclusive='");
@@ -154,7 +150,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             sb.Append("</numericRange>");
 
             return sb.ToString();
-
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
index dd79211..0b03046 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
@@ -54,14 +54,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         {
         }
 
-
         public override string ToString()
         {
             return "<prefixWildcard field='" + this.field + "' term='" + this.text
                 + "'/>";
         }
 
-
         public override IQueryNode CloneTree()
         {
             PrefixWildcardQueryNode clone = (PrefixWildcardQueryNode)base.CloneTree();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs
index 4fc079b..f499b83 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs
@@ -57,13 +57,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             return new BytesRef(text.ToString());
         }
 
-
         public override string ToString()
         {
             return "<regexp field='" + this.field + "' term='" + this.text + "'/>";
         }
 
-
         public override IQueryNode CloneTree()
         {
             RegexpQueryNode clone = (RegexpQueryNode)base.CloneTree();
@@ -72,7 +70,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             return clone;
         }
 
-
         public virtual ICharSequence Text
         {
             get { return text; }
@@ -94,6 +91,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         {
             return IsDefaultField(field) ? "/" + text + "/" : field + ":/" + text + "/";
         }
-
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
index e68817d..622f005 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
@@ -53,7 +53,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         {
         }
 
-
         public override string ToQueryString(IEscapeQuerySyntax escaper)
         {
             if (IsDefaultField(this.field))
@@ -71,7 +70,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             return "<wildcard field='" + this.field + "' term='" + this.text + "'/>";
         }
 
-
         public override IQueryNode CloneTree()
         {
             WildcardQueryNode clone = (WildcardQueryNode)base.CloneTree();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/CharStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/CharStream.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/CharStream.cs
index 2cd0b49..1bedab8 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/CharStream.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/CharStream.cs
@@ -112,6 +112,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
          * affect the lexer's operation.
          */
         void Done();
-
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/EscapeQuerySyntaxImpl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/EscapeQuerySyntaxImpl.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/EscapeQuerySyntaxImpl.cs
index 5eff8f8..8bddaca 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/EscapeQuerySyntaxImpl.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/EscapeQuerySyntaxImpl.cs
@@ -32,35 +32,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         private static readonly string[] escapableWordTokens = { "AND", "OR", "NOT",
             "TO", "WITHIN", "SENTENCE", "PARAGRAPH", "INORDER" };
 
-        //// LUCENENET specific overload for string
-        //private static string EscapeChar(string str, CultureInfo locale)
-        //{
-        //    if (str == null || str.Length == 0)
-        //        return str;
-
-        //    string buffer = str;
-
-        //    // regular escapable Char for terms
-        //    for (int i = 0; i < escapableTermChars.Length; i++)
-        //    {
-        //        buffer = ReplaceIgnoreCase(buffer, escapableTermChars[i].ToLower(locale),
-        //            "\\", locale);
-        //    }
-
-        //    // First Character of a term as more escaping chars
-        //    for (int i = 0; i < escapableTermExtraFirstChars.Length; i++)
-        //    {
-        //        if (buffer[0] == escapableTermExtraFirstChars[i][0])
-        //        {
-        //            buffer = "\\" + buffer[0]
-        //                + buffer.Substring(1, buffer.Length - 1);
-        //            break;
-        //        }
-        //    }
-
-        //    return buffer;
-        //}
-
         private static ICharSequence EscapeChar(ICharSequence str, CultureInfo locale)
         {
             if (str == null || str.Length == 0)
@@ -89,22 +60,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             return buffer;
         }
 
-        //// LUCENENET specific overload for string
-        //private string EscapeQuoted(string str, CultureInfo locale)
-        //{
-        //    if (str == null || str.Length == 0)
-        //        return str;
-
-        //    string buffer = str;
-
-        //    for (int i = 0; i < escapableQuotedChars.Length; i++)
-        //    {
-        //        buffer = ReplaceIgnoreCase(buffer, escapableTermChars[i].ToLower(locale),
-        //            "\\", locale);
-        //    }
-        //    return buffer;
-        //}
-
         private ICharSequence EscapeQuoted(ICharSequence str, CultureInfo locale)
         {
             if (str == null || str.Length == 0)
@@ -120,25 +75,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             return buffer;
         }
 
-        //// LUCENENET specific overload for string
-        //private static string EscapeTerm(string term, CultureInfo locale)
-        //{
-        //    if (term == null)
-        //        return term;
-
-        //    // Escape single Chars
-        //    term = EscapeChar(term, locale);
-        //    term = EscapeWhiteChar(term, locale);
-
-        //    // Escape Parser Words
-        //    for (int i = 0; i < escapableWordTokens.Length; i++)
-        //    {
-        //        if (escapableWordTokens[i].Equals(term.ToString(), StringComparison.OrdinalIgnoreCase))
-        //            return "\\" + term;
-        //    }
-        //    return term;
-        //}
-
         private static ICharSequence EscapeTerm(ICharSequence term, CultureInfo locale)
         {
             if (term == null)
@@ -168,7 +104,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
          *          the new character to prefix sequence1 in return string.
          * @return the new String
          */
-        // LUCENENET specific overload for string
         private static ICharSequence ReplaceIgnoreCase(ICharSequence @string,
             string sequence1, string escapeChar, CultureInfo locale)
         {
@@ -228,49 +163,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                 }
             }
             
-
             if (result.Length == 0 && copyStart == 0)
                 return @string;
             result.Append(@string.ToString().Substring(copyStart));
             return result.ToString().ToCharSequence();
         }
 
-        //private static ICharSequence ReplaceIgnoreCase(ICharSequence @string,
-        //   string sequence1, string escapeChar, CultureInfo locale)
-        //{
-        //    if (escapeChar == null || sequence1 == null || @string == null)
-        //        throw new NullReferenceException(); // LUCNENET TODO: ArgumentException...
-
-        //    return new StringCharSequenceWrapper(
-        //        ReplaceIgnoreCase(@string.ToString(), sequence1, escapeChar, locale));
-        //}
-
-        ///**
-        // * escape all tokens that are part of the parser syntax on a given string
-        // * 
-        // * @param str
-        // *          string to get replaced
-        // * @param locale
-        // *          locale to be used when performing string compares
-        // * @return the new String
-        // */
-        //// LUCENENET specific overload for string
-        //private static string EscapeWhiteChar(string str,
-        //    CultureInfo locale)
-        //{
-        //    if (str == null || str.Length == 0)
-        //        return str;
-
-        //    string buffer = str;
-
-        //    for (int i = 0; i < escapableWhiteChars.Length; i++)
-        //    {
-        //        buffer = ReplaceIgnoreCase(buffer, escapableWhiteChars[i].ToLower(locale),
-        //            "\\", locale);
-        //    }
-        //    return buffer;
-        //}
-
         /**
          * escape all tokens that are part of the parser syntax on a given string
          * 
@@ -443,6 +341,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     QueryParserMessages.INVALID_SYNTAX_ESCAPE_NONE_HEX_UNICODE, c));
             }
         }
-
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/FastCharStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/FastCharStream.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/FastCharStream.cs
index 147c411..4c88c80 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/FastCharStream.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/FastCharStream.cs
@@ -31,7 +31,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             input = r;
         }
 
-
         public char ReadChar()
         {
             if (bufferPosition >= bufferLength)
@@ -80,7 +79,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             return ReadChar();
         }
 
-
         public void BackUp(int amount)
         {
             bufferPosition -= amount;
@@ -91,7 +89,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             return new string(buffer, tokenStart, bufferPosition - tokenStart);
         }
 
-
         public char[] GetSuffix(int len)
         {
             char[] value = new char[len];
@@ -114,14 +111,17 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         {
             get { return bufferStart + bufferPosition; }
         }
+
         public int Line
         {
             get { return 1; }
         }
+
         public int EndColumn
         {
             get { return bufferStart + bufferPosition; }
         }
+
         public int EndLine
         {
             get { return 1; }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
index e9de2e5..b624728 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
@@ -18,16 +18,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
     /// You can modify this class to customize your error reporting
     /// mechanisms so long as you retain the public fields.
     /// </summary>
+    [Serializable]
     public class ParseException : QueryNodeParseException
     {
         /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-        private static readonly long serialVersionUID = 1L;
-
-        /**
          * This constructor is used by the method "generateParseException"
          * in the generated parser.  Calling this constructor generates
          * a new object of this type with the fields "currentToken",
@@ -52,7 +46,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
          * relevant information.  The JavaCC generated code does not use
          * these constructors.
          */
-
         public ParseException()
             : base(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, "Error"))
         {
@@ -64,7 +57,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         {
         }
 
-
         /**
          * This is the last token that has been consumed successfully.  If
          * this object has been created due to a parse error, the token
@@ -150,7 +142,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         /**
          * The end of line string for this machine.
          */
-        //protected String eol = System.getProperty("line.separator", "\n");
         protected string eol = Environment.NewLine;
 
         /**

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs
index 7507b9d..b1f11dd 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs
@@ -29,6 +29,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             : this(new FastCharStream(new StringReader("")))
         {
         }
+
         /** Parses a query string, returning a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode}.
         *  @param query  the query string to be parsed.
         *  @throws ParseException if the parsing fails

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/TokenMgrError.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/TokenMgrError.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/TokenMgrError.cs
index 0485601..9c609a1 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/TokenMgrError.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/TokenMgrError.cs
@@ -1,4 +1,5 @@
-´╗┐using System;
+´╗┐using Lucene.Net.Support;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,13 +13,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
     [Serializable]
     public class TokenMgrError : Exception
     {
-        /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-        private static readonly long serialVersionUID = 1L;
-
         /*
          * Ordinals for various reasons why an Error of this type can be thrown.
          */
@@ -90,8 +84,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     default:
                         if ((ch = str[i]) < 0x20 || ch > 0x7e)
                         {
-                            //string s = "0000" + Integer.toString(ch, 16);
-                            string s = "0000" + Convert.ToString(ch, 16);
+                            string s = "0000" + Number.ToString(ch, 16);
                             retval.Append("\\u" + s.Substring(s.Length - 4, /*s.Length - (s.Length - 4)*/ 4));
                         }
                         else

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AllowLeadingWildcardProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AllowLeadingWildcardProcessor.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AllowLeadingWildcardProcessor.cs
index a672fa4..c40f5b2 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AllowLeadingWildcardProcessor.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AllowLeadingWildcardProcessor.cs
@@ -31,35 +31,29 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
             // empty constructor
         }
 
-
         public override IQueryNode Process(IQueryNode queryTree)
         {
             bool? allowsLeadingWildcard = GetQueryConfigHandler().Get(ConfigurationKeys.ALLOW_LEADING_WILDCARD);
 
             if (allowsLeadingWildcard != null)
             {
-
                 if (!allowsLeadingWildcard.Value)
                 {
                     return base.Process(queryTree);
                 }
-
             }
 
             return queryTree;
         }
 
-
         protected override IQueryNode PostProcessNode(IQueryNode node)
         {
-
             if (node is WildcardQueryNode)
             {
                 WildcardQueryNode wildcardNode = (WildcardQueryNode)node;
 
                 if (wildcardNode.Text.Length > 0)
                 {
-
                     // Validate if the wildcard was escaped
                     if (UnescapedCharSequence.WasEscaped(wildcardNode.Text, 0))
                         return node;
@@ -73,28 +67,19 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                                     .ToQueryString(new EscapeQuerySyntaxImpl())));
                     }
                 }
-
             }
 
             return node;
-
         }
 
-
         protected override IQueryNode PreProcessNode(IQueryNode node)
         {
-
             return node;
-
         }
 
-
         protected override IList<IQueryNode> SetChildrenOrder(IList<IQueryNode> children)
         {
-
             return children;
-
         }
-
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
index bbfccea..668282c 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
@@ -51,7 +51,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
             // empty constructor
         }
 
-
         public override IQueryNode Process(IQueryNode queryTree)
         {
             Analyzer analyzer = GetQueryConfigHandler().Get(ConfigurationKeys.ANALYZER);
@@ -73,24 +72,19 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                 {
                     return base.Process(queryTree);
                 }
-
             }
 
             return queryTree;
-
         }
 
-
         protected override IQueryNode PostProcessNode(IQueryNode node)
         {
-
             if (node is ITextableQueryNode
                 && !(node is WildcardQueryNode)
                 && !(node is FuzzyQueryNode)
                 && !(node is RegexpQueryNode)
                 && !(node.Parent is IRangeQueryNode))
             {
-
                 FieldQueryNode fieldNode = ((FieldQueryNode)node);
                 string text = fieldNode.GetTextAsString();
                 string field = fieldNode.GetFieldAsString();
@@ -115,7 +109,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
 
                     try
                     {
-
                         while (buffer.IncrementToken())
                         {
                             numTokens++;
@@ -124,15 +117,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                             if (positionIncrement != 0)
                             {
                                 positionCount += positionIncrement;
-
                             }
                             else
                             {
                                 severalTokensAtSamePosition = true;
                             }
-
                         }
-
                     }
                     catch (IOException e)
                     {
@@ -172,7 +162,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                         hasNext = buffer.IncrementToken();
                         Debug.Assert(hasNext == true);
                         term = termAtt.ToString();
-
                     }
                     catch (IOException e)
                     {
@@ -182,7 +171,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                     fieldNode.Text = term.ToCharSequence();
 
                     return fieldNode;
-
                 }
                 else if (severalTokensAtSamePosition || !(node is QuotedFieldQueryNode))
                 {
@@ -203,7 +191,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                                     bool hasNext = buffer.IncrementToken();
                                     Debug.Assert(hasNext == true);
                                     term = termAtt.ToString();
-
                                 }
                                 catch (IOException e)
                                 {
@@ -215,7 +202,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                             }
                             return new GroupQueryNode(
                                 new StandardBooleanQueryNode(children, positionCount == 1));
-
                         }
                         else
                         {
@@ -299,7 +285,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                                 {
                                     positionIncrement = posIncrAtt.PositionIncrement;
                                 }
-
                             }
                             catch (IOException e)
                             {
@@ -308,10 +293,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
 
                             if (positionIncrement > 0 && multiTerms.Count > 0)
                             {
-
                                 foreach (FieldQueryNode termNode in multiTerms)
                                 {
-
                                     if (this.positionIncrementsEnabled)
                                     {
                                         termNode.PositionIncrement = position;
@@ -322,7 +305,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                                     }
 
                                     mpq.Add(termNode);
-
                                 }
 
                                 // Only increment once for each "group" of
@@ -330,21 +312,17 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                                 termGroupCount++;
 
                                 multiTerms.Clear();
-
                             }
 
                             position += positionIncrement;
                             multiTerms.Add(new FieldQueryNode(field, term, -1, -1));
-
                         }
 
                         foreach (FieldQueryNode termNode in multiTerms)
                         {
-
                             if (this.positionIncrementsEnabled)
                             {
                                 termNode.PositionIncrement = position;
-
                             }
                             else
                             {
@@ -352,17 +330,13 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                             }
 
                             mpq.Add(termNode);
-
                         }
 
                         return mpq;
-
                     }
-
                 }
                 else
                 {
-
                     TokenizedPhraseQueryNode pq = new TokenizedPhraseQueryNode();
 
                     int position = -1;
@@ -382,7 +356,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                             {
                                 positionIncrement = posIncrAtt.PositionIncrement;
                             }
-
                         }
                         catch (IOException e)
                         {
@@ -395,7 +368,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                         {
                             position += positionIncrement;
                             newFieldNode.PositionIncrement = position;
-
                         }
                         else
                         {
@@ -403,33 +375,23 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                         }
 
                         pq.Add(newFieldNode);
-
                     }
 
                     return pq;
-
                 }
-
             }
 
             return node;
-
         }
 
-
         protected override IQueryNode PreProcessNode(IQueryNode node)
         {
-
             return node;
-
         }
 
-
         protected override IList<IQueryNode> SetChildrenOrder(IList<IQueryNode> children)
         {
-
             return children;
-
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/BooleanQuery2ModifierNodeProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/BooleanQuery2ModifierNodeProcessor.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/BooleanQuery2ModifierNodeProcessor.cs
index e6d392f..090eb76 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/BooleanQuery2ModifierNodeProcessor.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/BooleanQuery2ModifierNodeProcessor.cs
@@ -50,7 +50,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
             // empty constructor
         }
 
-
         public virtual IQueryNode Process(IQueryNode queryTree)
         {
             Operator? op = GetQueryConfigHandler().Get(
@@ -65,7 +64,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
             this.usingAnd = Operator.AND == op;
 
             return ProcessIteration(queryTree);
-
         }
 
 
@@ -91,7 +89,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
             queryTree = PostProcessNode(queryTree);
 
             return queryTree;
-
         }
 
         protected virtual void FillChildrenBufferAndApplyModifiery(IQueryNode parent)
@@ -123,7 +120,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                 node.Set(childrenBuffer);
             }
             return node;
-
         }
 
         protected virtual IQueryNode PreProcessNode(IQueryNode node)
@@ -143,7 +139,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
             else if (parent is BooleanQueryNode)
             {
                 if ((parent is AndQueryNode)
-          || (usingAnd && IsDefaultBooleanQueryNode(parent)))
+                    || (usingAnd && IsDefaultBooleanQueryNode(parent)))
                 {
                     TagModifierButDoNotOverride(node, Modifier.MOD_REQ);
                 }
@@ -158,12 +154,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
 
         private IQueryNode ApplyModifier(IQueryNode node, Modifier mod)
         {
-
             // check if modifier is not already defined and is default
             if (!(node is ModifierQueryNode))
             {
                 return new BooleanModifierNode(node, mod);
-
             }
             else
             {
@@ -173,11 +167,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                 {
                     return new ModifierQueryNode(modNode.GetChild(), mod);
                 }
-
             }
 
             return node;
-
         }
 
         protected virtual void TagModifierButDoNotOverride(IQueryNode node, Modifier mod)
@@ -199,10 +191,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
         public virtual void SetQueryConfigHandler(QueryConfigHandler queryConfigHandler)
         {
             this.queryConfigHandler = queryConfigHandler;
-
         }
 
-
         public virtual QueryConfigHandler GetQueryConfigHandler()
         {
             return queryConfigHandler;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8e1931b9/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/BooleanSingleChildOptimizationQueryNodeProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/BooleanSingleChildOptimizationQueryNodeProcessor.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/BooleanSingleChildOptimizationQueryNodeProcessor.cs
index a6dbc75..38b7873 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/BooleanSingleChildOptimizationQueryNodeProcessor.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/BooleanSingleChildOptimizationQueryNodeProcessor.cs
@@ -23,10 +23,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
             // empty constructor
         }
 
-
         protected override IQueryNode PostProcessNode(IQueryNode node)
         {
-
             if (node is BooleanQueryNode)
             {
                 IList<IQueryNode> children = node.GetChildren();
@@ -42,38 +40,27 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
                         if (modNode is BooleanModifierNode
                             || modNode.Modifier == Modifier.MOD_NONE)
                         {
-
                             return child;
-
                         }
-
                     }
                     else
                     {
                         return child;
                     }
-
                 }
-
             }
 
             return node;
-
         }
 
-
         protected override IQueryNode PreProcessNode(IQueryNode node)
         {
-
             return node;
-
         }
 
         protected override IList<IQueryNode> SetChildrenOrder(IList<IQueryNode> children)
         {
-
             return children;
-
         }
     }
 }


Mime
View raw message