lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [17/58] lucenenet git commit: QueryParser.Flexible Refactor: Properties
Date Tue, 06 Dec 2016 15:11:52 GMT
QueryParser.Flexible Refactor: Properties


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/0aa30ca8
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/0aa30ca8
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/0aa30ca8

Branch: refs/heads/master
Commit: 0aa30ca8fde051ba163cf572cbe211790fdb4864
Parents: 8076b1e
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Tue Nov 29 22:28:12 2016 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Tue Nov 29 22:28:12 2016 +0700

----------------------------------------------------------------------
 .../Flexible/Core/Config/FieldConfig.cs         |   4 +-
 .../Flexible/Core/Nodes/AndQueryNode.cs         |  14 +-
 .../Flexible/Core/Nodes/AnyQueryNode.cs         |  38 ++--
 .../Flexible/Core/Nodes/BooleanQueryNode.cs     |  14 +-
 .../Flexible/Core/Nodes/BoostQueryNode.cs       |  29 +--
 .../Flexible/Core/Nodes/FieldQueryNode.cs       |  79 ++------
 .../Flexible/Core/Nodes/FieldableNode.cs        |  17 +-
 .../Flexible/Core/Nodes/FuzzyQueryNode.cs       |  27 +--
 .../Flexible/Core/Nodes/ModifierQueryNode.cs    |   6 +-
 .../Flexible/Core/Nodes/OpaqueQueryNode.cs      |   8 +-
 .../Flexible/Core/Nodes/OrQueryNode.cs          |  14 +-
 .../Flexible/Core/Nodes/PhraseSlopQueryNode.cs  |   4 +-
 .../Flexible/Core/Nodes/ProximityQueryNode.cs   |  72 ++++---
 .../Flexible/Core/Nodes/QueryNode.cs            |   6 +-
 .../Flexible/Core/Nodes/QueryNodeImpl.cs        |  28 +--
 .../Flexible/Core/Nodes/RangeQueryNode.cs       |  10 +-
 .../Flexible/Core/Nodes/SlopQueryNode.cs        |   4 +-
 .../Core/Nodes/TokenizedPhraseQueryNode.cs      |  15 +-
 .../RemoveDeletedQueryNodesProcessor.cs         |   2 +-
 .../Flexible/Core/QueryNodeParseException.cs    |  49 ++---
 .../Flexible/Core/QueryParserHelper.cs          |  28 +--
 .../Flexible/Messages/NLS.cs                    |   4 +-
 .../Precedence/PrecedenceQueryParser.cs         |   4 +-
 .../BooleanModifiersQueryNodeProcessor.cs       |   2 +-
 .../Standard/Builders/AnyQueryNodeBuilder.cs    |   2 +-
 .../Builders/BooleanQueryNodeBuilder.cs         |   2 +-
 .../Standard/Builders/BoostQueryNodeBuilder.cs  |   4 +-
 .../Standard/Builders/FuzzyQueryNodeBuilder.cs  |   4 +-
 .../Builders/MultiPhraseQueryNodeBuilder.cs     |   4 +-
 .../Builders/NumericRangeQueryNodeBuilder.cs    |   6 +-
 .../Standard/Builders/PhraseQueryNodeBuilder.cs |   2 +-
 .../Standard/Builders/RegexpQueryNodeBuilder.cs |   2 +-
 .../Standard/Builders/SlopQueryNodeBuilder.cs   |   4 +-
 .../Builders/StandardBooleanQueryNodeBuilder.cs |   2 +-
 .../Standard/CommonQueryParserConfiguration.cs  |   2 +-
 .../Standard/Config/FieldBoostMapFCListener.cs  |   2 +-
 .../Config/FieldDateResolutionFCListener.cs     |   2 +-
 .../Flexible/Standard/Config/FuzzyConfig.cs     |  20 +-
 .../Flexible/Standard/Config/NumericConfig.cs   |  89 +++------
 .../Config/NumericFieldConfigListener.cs        |   2 +-
 .../Standard/Nodes/MultiPhraseQueryNode.cs      |  10 +-
 .../Flexible/Standard/Nodes/NumericQueryNode.cs |  21 +-
 .../Standard/Nodes/NumericRangeQueryNode.cs     |  16 +-
 .../Standard/Nodes/PrefixWildcardQueryNode.cs   |   2 +-
 .../Flexible/Standard/Nodes/RegexpQueryNode.cs  |   4 +-
 .../Standard/Nodes/WildcardQueryNode.cs         |   2 +-
 .../Flexible/Standard/Parser/CharStream.cs      |  12 +-
 .../Standard/Parser/EscapeQuerySyntaxImpl.cs    | 196 ++++++++++---------
 .../Flexible/Standard/Parser/FastCharStream.cs  |  24 +--
 .../Parser/StandardSyntaxParserTokenManager.cs  |  12 +-
 .../Flexible/Standard/Parser/Token.cs           |   4 +-
 .../Processors/AnalyzerQueryNodeProcessor.cs    |  14 +-
 .../BooleanQuery2ModifierNodeProcessor.cs       |   6 +-
 ...SingleChildOptimizationQueryNodeProcessor.cs |   2 +-
 .../Processors/BoostQueryNodeProcessor.cs       |   2 +-
 .../Processors/FuzzyQueryNodeProcessor.cs       |   8 +-
 .../Processors/GroupQueryNodeProcessor.cs       |  10 +-
 .../LowercaseExpandedTermsQueryNodeProcessor.cs |   2 +-
 .../Processors/NumericQueryNodeProcessor.cs     |   6 +-
 .../NumericRangeQueryNodeProcessor.cs           |   4 +-
 .../RemoveEmptyNonLeafQueryNodeProcessor.cs     |   4 +-
 .../Processors/WildcardQueryNodeProcessor.cs    |   2 +-
 .../Flexible/Standard/StandardQueryParser.cs    | 166 ++++++++--------
 .../Flexible/Core/Nodes/TestQueryNode.cs        |  12 +-
 .../Precedence/TestPrecedenceQueryParser.cs     |  16 +-
 .../Standard/TestMultiAnalyzerQPHelper.cs       |   2 +-
 .../Flexible/Standard/TestMultiFieldQPHelper.cs |   6 +-
 .../Flexible/Standard/TestQPHelper.cs           |   8 +-
 .../Flexible/Standard/TestStandardQP.cs         |  14 +-
 69 files changed, 540 insertions(+), 674 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Config/FieldConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Config/FieldConfig.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Config/FieldConfig.cs
index 33045ab..cd5d124 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Config/FieldConfig.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Config/FieldConfig.cs
@@ -36,9 +36,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Config
          * 
          * @return the field name
          */
-        public virtual string GetField()
+        public virtual string Field
         {
-            return this.fieldName;
+            get { return this.fieldName; }
         }
 
         public override string ToString()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AndQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AndQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AndQueryNode.cs
index fa2b365..5b6aed2 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AndQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AndQueryNode.cs
@@ -30,11 +30,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         public override string ToString()
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "<boolean operation='and'/>";
             StringBuilder sb = new StringBuilder();
             sb.Append("<boolean operation='and'>");
-            foreach (IQueryNode child in GetChildren())
+            foreach (IQueryNode child in children)
             {
                 sb.Append("\n");
                 sb.Append(child.ToString());
@@ -47,20 +48,21 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         public override string ToQueryString(IEscapeQuerySyntax escapeSyntaxParser)
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "";
 
             StringBuilder sb = new StringBuilder();
             string filler = "";
-            foreach (IQueryNode child in GetChildren())
+            foreach (IQueryNode child in children)
             {
                 sb.Append(filler).Append(child.ToQueryString(escapeSyntaxParser));
                 filler = " AND ";
             }
 
             // in case is root or the parent is a group node avoid parenthesis
-            if ((GetParent() != null && GetParent() is GroupQueryNode)
-        || IsRoot())
+            if ((Parent != null && Parent is GroupQueryNode)
+                || IsRoot)
                 return sb.ToString();
             else
                 return "( " + sb.ToString() + " )";

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AnyQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AnyQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AnyQueryNode.cs
index 29768ff..72ed581 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AnyQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AnyQueryNode.cs
@@ -53,9 +53,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         }
 
-        public virtual int GetMinimumMatchingElements()
+        public virtual int MinimumMatchingElements
         {
-            return this.minimumMatchingmElements;
+            get { return this.minimumMatchingmElements; }
         }
 
         /**
@@ -63,11 +63,15 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
          * 
          * @return the field
          */
-        public virtual string GetField()
+        public virtual string Field
         {
-            return this.field;
+            get { return this.field; }
+            set { this.field = value; }
         }
 
+
+        // LUCENENET TODO: No need for GetFieldAsString method because
+        // field is already type string
         /**
          * returns - null if the field was not specified
          * 
@@ -81,14 +85,14 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
                 return this.field.ToString();
         }
 
-        /**
-         * @param field
-         *          - the field to set
-         */
-        public virtual void SetField(string field)
-        {
-            this.field = field;
-        }
+        ///**
+        // * @param field
+        // *          - the field to set
+        // */
+        //public virtual void SetField(string field)
+        //{
+        //    this.field = field;
+        //}
 
 
         public override IQueryNode CloneTree()
@@ -104,13 +108,14 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         public override string ToString()
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "<any field='" + this.field + "'  matchelements="
                     + this.minimumMatchingmElements + "/>";
             StringBuilder sb = new StringBuilder();
             sb.Append("<any field='" + this.field + "'  matchelements="
                 + this.minimumMatchingmElements + ">");
-            foreach (IQueryNode clause in GetChildren())
+            foreach (IQueryNode clause in children)
             {
                 sb.Append("\n");
                 sb.Append(clause.ToString());
@@ -124,14 +129,15 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
             string anySTR = "ANY " + this.minimumMatchingmElements;
 
             StringBuilder sb = new StringBuilder();
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
             {
                 // no childs case
             }
             else
             {
                 string filler = "";
-                foreach (IQueryNode clause in GetChildren())
+                foreach (IQueryNode clause in children)
                 {
                     sb.Append(filler).Append(clause.ToQueryString(escapeSyntaxParser));
                     filler = " ";

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BooleanQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BooleanQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BooleanQueryNode.cs
index 6a3e21e..d8b7c66 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BooleanQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BooleanQueryNode.cs
@@ -28,11 +28,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         public override string ToString()
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "<boolean operation='default'/>";
             StringBuilder sb = new StringBuilder();
             sb.Append("<boolean operation='default'>");
-            foreach (IQueryNode child in GetChildren())
+            foreach (IQueryNode child in children)
             {
                 sb.Append("\n");
                 sb.Append(child.ToString());
@@ -44,20 +45,21 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         public override string ToQueryString(IEscapeQuerySyntax escapeSyntaxParser)
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "";
 
             StringBuilder sb = new StringBuilder();
             string filler = "";
-            foreach (IQueryNode child in GetChildren())
+            foreach (IQueryNode child in children)
             {
                 sb.Append(filler).Append(child.ToQueryString(escapeSyntaxParser));
                 filler = " ";
             }
 
             // in case is root or the parent is a group node avoid parenthesis
-            if ((GetParent() != null && GetParent() is GroupQueryNode)
-                || IsRoot())
+            if ((Parent != null && Parent is GroupQueryNode)
+                || IsRoot)
                 return sb.ToString();
             else
                 return "( " + sb.ToString() + " )";

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BoostQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BoostQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BoostQueryNode.cs
index b9a1b27..f0a0a7f 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BoostQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BoostQueryNode.cs
@@ -46,16 +46,19 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
          * 
          * @return the single child which this node boosts
          */
-        public virtual IQueryNode GetChild()
+        public virtual IQueryNode Child
         {
-            IList<IQueryNode> children = GetChildren();
-
-            if (children == null || children.Count == 0)
+            get
             {
-                return null;
-            }
+                IList<IQueryNode> children = GetChildren();
 
-            return children[0];
+                if (children == null || children.Count == 0)
+                {
+                    return null;
+                }
+
+                return children[0];
+            }
 
         }
 
@@ -64,9 +67,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
          * 
          * @return the boost value
          */
-        public virtual float GetValue()
+        public virtual float Value
         {
-            return this.value;
+            get { return this.value; }
         }
 
         /**
@@ -80,7 +83,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
             if (f == (long)f)
                 return "" + (long)f;
             else
-                return "" + f;
+                return "" + f.ToString("0.0#######"); // LUCENENET TODO: Culture
 
         }
 
@@ -88,15 +91,15 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         public override string ToString()
         {
             return "<boost value='" + GetValueString() + "'>" + "\n"
-                + GetChild().ToString() + "\n</boost>";
+                + Child.ToString() + "\n</boost>";
         }
 
 
         public override string ToQueryString(IEscapeQuerySyntax escapeSyntaxParser)
         {
-            if (GetChild() == null)
+            if (Child == null)
                 return "";
-            return GetChild().ToQueryString(escapeSyntaxParser) + "^"
+            return Child.ToQueryString(escapeSyntaxParser) + "^"
                 + GetValueString();
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
index 3930b6a..45161e2 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
@@ -118,6 +118,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
                 return this.text.ToString();
         }
 
+        // LUCENENET TODO: this method is not required because Field is already type string in .NET
         /**
          * returns null if the field was not specified in the query string
          * 
@@ -131,24 +132,16 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
                 return this.field.ToString();
         }
 
-        public virtual int GetBegin()
+        public virtual int Begin
         {
-            return this.begin;
+            get { return this.begin; }
+            set { this.begin = value; }
         }
 
-        public virtual void SetBegin(int begin)
+        public virtual int End
         {
-            this.begin = begin;
-        }
-
-        public virtual int GetEnd()
-        {
-            return this.end;
-        }
-
-        public virtual void SetEnd(int end)
-        {
-            this.end = end;
+            get { return this.end; }
+            set { this.end = value; }
         }
 
         public virtual string Field
@@ -157,56 +150,21 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
             set { this.field = value; }
         }
 
-        //      @Override
-        //public CharSequence getField()
-        //      {
-        //          return this.field;
-        //      }
-
-        //      @Override
-        //public void setField(CharSequence field)
-        //      {
-        //          this.field = field;
-        //      }
-
-        public virtual int GetPositionIncrement()
+        public virtual int PositionIncrement
         {
-            return this.positionIncrement;
-        }
-
-        public virtual void SetPositionIncrement(int pi)
-        {
-            this.positionIncrement = pi;
+            get { return this.positionIncrement; }
+            set { this.positionIncrement = value; }
         }
 
+        /// <summary>
+        /// Gets or Sets the "original" form of the term.
+        /// </summary>
         public virtual ICharSequence Text
         {
             get { return this.text; }
             set { this.text = value; }
         }
 
-        ///**
-        // * Returns the term.
-        // * 
-        // * @return The "original" form of the term.
-        // */
-
-        //public override string GetText()
-        //{
-        //    return this.text;
-        //}
-
-        ///**
-        // * @param text
-        // *          the text to set
-        // */
-
-        //public override void SetText(string text)
-        //{
-        //    this.text = text;
-        //}
-
-
         public override IQueryNode CloneTree()
         {
             FieldQueryNode fqn = (FieldQueryNode)base.CloneTree();
@@ -226,16 +184,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
             get { return Text.ToString(); }
             set { Text = value.ToCharSequence(); }
         }
-
-        //public override string GetValue()
-        //{
-        //    return GetText();
-        //}
-
-
-        //public override void SetValue(string value)
-        //{
-        //    SetText(value);
-        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldableNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldableNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldableNode.cs
index e9b6439..922c456 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldableNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldableNode.cs
@@ -16,23 +16,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
     public interface IFieldableNode : IQueryNode
     {
         /// <summary>
-        /// Gets or Sets the field associated to the node and every node under it.
+        /// Gets or Sets the field name associated to the node and every node under it.
         /// </summary>
         string Field { get; set; }
-
-        //     /**
-        //* Returns the field associated to the node and every node under it.
-        //* 
-        //* @return the field name
-        //*/
-        //     string GetField(); 
-
-        //     /**
-        //      * Associates the node to a field.
-        //      * 
-        //      * @param fieldName
-        //      *          the field name
-        //      */
-        //     void SetField(string fieldName);
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
index f80e4fb..81b0cb7 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
@@ -63,14 +63,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
             SetLeaf(true);
         }
 
-        public virtual void SetPrefixLength(int prefixLength)
+        public virtual int PrefixLength
         {
-            this.prefixLength = prefixLength;
-        }
-
-        public virtual int GetPrefixLength()
-        {
-            return this.prefixLength;
+            get { return this.prefixLength; }
+            set { this.prefixLength = value; }
         }
 
 
@@ -93,12 +89,15 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
                 + "' term='" + this.text + "'/>";
         }
 
-        public virtual void SetSimilarity(float similarity)
+        /**
+         * @return the similarity
+         */
+        public virtual float Similarity
         {
-            this.similarity = similarity;
+            get { return this.similarity; }
+            set { this.similarity = value; }
         }
 
-
         public override IQueryNode CloneTree()
         {
             FuzzyQueryNode clone = (FuzzyQueryNode)base.CloneTree();
@@ -107,13 +106,5 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
             return clone;
         }
-
-        /**
-         * @return the similarity
-         */
-        public virtual float GetSimilarity()
-        {
-            return this.similarity;
-        }
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ModifierQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ModifierQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ModifierQueryNode.cs
index b4fb148..9626f2d 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ModifierQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ModifierQueryNode.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
 
 
-        private Modifier modifier = Modifier.MOD_NONE;
+        private Modifier modifier = Nodes.Modifier.MOD_NONE;
 
         /**
          * Used to store the modifier value on the original query string
@@ -54,9 +54,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
             return GetChildren()[0];
         }
 
-        public virtual Modifier GetModifier()
+        public virtual Modifier Modifier
         {
-            return this.modifier;
+            get { return this.modifier; }
         }
 
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/OpaqueQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/OpaqueQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/OpaqueQueryNode.cs
index 6be66a7..ebdb6ec 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/OpaqueQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/OpaqueQueryNode.cs
@@ -59,17 +59,17 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         /**
          * @return the schema
          */
-        public virtual string GetSchema()
+        public virtual string Schema
         {
-            return this.schema;
+            get { return this.schema; }
         }
 
         /**
          * @return the value
          */
-        public virtual string GetValue()
+        public virtual string Value
         {
-            return this.value;
+            get { return this.value; }
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/OrQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/OrQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/OrQueryNode.cs
index edd3577..b8596f6 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/OrQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/OrQueryNode.cs
@@ -29,11 +29,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         public override string ToString()
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "<boolean operation='or'/>";
             StringBuilder sb = new StringBuilder();
             sb.Append("<boolean operation='or'>");
-            foreach (IQueryNode child in GetChildren())
+            foreach (IQueryNode child in children)
             {
                 sb.Append("\n");
                 sb.Append(child.ToString());
@@ -46,20 +47,21 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         public override string ToQueryString(IEscapeQuerySyntax escapeSyntaxParser)
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "";
 
             StringBuilder sb = new StringBuilder();
             string filler = "";
-            for (IEnumerator<IQueryNode> it = GetChildren().GetEnumerator(); it.MoveNext();)
+            for (IEnumerator<IQueryNode> it = children.GetEnumerator(); it.MoveNext();)
             {
                 sb.Append(filler).Append(it.Current.ToQueryString(escapeSyntaxParser));
                 filler = " OR ";
             }
 
             // in case is root or the parent is a group node avoid parenthesis
-            if ((GetParent() != null && GetParent() is GroupQueryNode)
-                || IsRoot())
+            if ((Parent != null && Parent is GroupQueryNode)
+                || IsRoot)
                 return sb.ToString();
             else
                 return "( " + sb.ToString() + " )";

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/PhraseSlopQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/PhraseSlopQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/PhraseSlopQueryNode.cs
index a578691..9cf9042 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/PhraseSlopQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/PhraseSlopQueryNode.cs
@@ -38,9 +38,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
             return GetChildren()[0];
         }
 
-        public virtual int GetValue()
+        public virtual int Value
         {
-            return this.value;
+            get { return this.value; }
         }
 
         private string GetValueString()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ProximityQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ProximityQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ProximityQueryNode.cs
index 4bdb237..a825017 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ProximityQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ProximityQueryNode.cs
@@ -50,24 +50,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         //    internal abstract string ToQueryString();
         //}
 
-        /** utility class containing the distance condition and number */
-        public class ProximityType
-        {
-            internal int pDistance = 0;
-
-            ProximityQueryNode.Type pType/* = null*/;
-
-            public ProximityType(ProximityQueryNode.Type type)
-                    : this(type, 0)
-            {
-            }
-
-            public ProximityType(ProximityQueryNode.Type type, int distance)
-            {
-                this.pType = type;
-                this.pDistance = distance;
-            }
-        }
+        // LUCENENET NOTE: Moved ProximityType class outside of ProximityQueryNode class to
+        // prevent a naming conflict witht eh ProximityType property.
 
         private ProximityQueryNode.Type proximityType = ProximityQueryNode.Type.SENTENCE;
         private int distance = -1;
@@ -148,9 +132,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
             }
         }
 
-        public virtual ProximityQueryNode.Type GetProximityType()
+        public virtual ProximityQueryNode.Type ProximityType
         {
-            return this.proximityType;
+            get { return this.proximityType; }
         }
 
         public override string ToString()
@@ -158,14 +142,15 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
             string distanceSTR = ((this.distance == -1) ? ("")
                 : (" distance='" + this.distance) + "'");
 
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "<proximity field='" + this.field + "' inorder='" + this.inorder
                     + "' type='" + this.proximityType.ToString() + "'" + distanceSTR
                     + "/>";
             StringBuilder sb = new StringBuilder();
             sb.Append("<proximity field='" + this.field + "' inorder='" + this.inorder
                 + "' type='" + this.proximityType.ToString() + "'" + distanceSTR + ">");
-            foreach (IQueryNode child in GetChildren())
+            foreach (IQueryNode child in children)
             {
                 sb.Append("\n");
                 sb.Append(child.ToString());
@@ -182,14 +167,15 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
                 + ((this.inorder) ? (" INORDER") : (""));
 
             StringBuilder sb = new StringBuilder();
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
             {
                 // no children case
             }
             else
             {
                 string filler = "";
-                foreach (IQueryNode child in GetChildren())
+                foreach (IQueryNode child in children)
                 {
                     sb.Append(filler).Append(child.ToQueryString(escapeSyntaxParser));
                     filler = " ";
@@ -221,9 +207,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         /**
          * @return the distance
          */
-        public virtual int GetDistance()
+        public virtual int Distance
         {
-            return this.distance;
+            get { return this.distance; }
         }
 
         /**
@@ -231,11 +217,13 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
          * 
          * @return the field
          */
-        public virtual string GetField()
+        public virtual string Field
         {
-            return this.field;
+            get { return this.field; }
+            set { this.field = value; }
         }
 
+        // LUCENENET TODO: This method is not required because Field is already a string property
         /**
          * returns null if the field was not specified in the query string
          * 
@@ -250,20 +238,30 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         }
 
         /**
-         * @param field
-         *          the field to set
+         * @return terms must be matched in the specified order
          */
-        public virtual void SetField(string field)
+        public virtual bool IsInOrder
         {
-            this.field = field;
+            get { return this.inorder; }
         }
+    }
 
-        /**
-         * @return terms must be matched in the specified order
-         */
-        public virtual bool IsInOrder()
+    /** utility class containing the distance condition and number */
+    public class ProximityType
+    {
+        internal int pDistance = 0;
+
+        ProximityQueryNode.Type pType/* = null*/;
+
+        public ProximityType(ProximityQueryNode.Type type)
+                : this(type, 0)
+        {
+        }
+
+        public ProximityType(ProximityQueryNode.Type type, int distance)
         {
-            return this.inorder;
+            this.pType = type;
+            this.pDistance = distance;
         }
     }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNode.cs
index 004611b..32dd875 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNode.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         IList<IQueryNode> GetChildren();
 
         /** verify if a node is a Leaf node */
-        bool IsLeaf();
+        bool IsLeaf { get; }
 
         /** verify if a node contains a tag */
         bool ContainsTag(string tagName);
@@ -35,7 +35,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
          */
         object GetTag(string tagName);
 
-        IQueryNode GetParent();
+        IQueryNode Parent { get; }
 
         /**
          * Recursive clone the QueryNode tree The tags are not copied to the new tree
@@ -73,7 +73,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
          * 
          * @return a map containing all tags attached to this query node
          */
-        IDictionary<string, object> GetTagMap();
+        IDictionary<string, object> TagMap { get; }
 
         /**
          * Removes this query node from its parent.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNodeImpl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNodeImpl.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNodeImpl.cs
index b22e95c..b7d7c39 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNodeImpl.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNodeImpl.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         public void Add(IQueryNode child)
         {
 
-            if (IsLeaf() || this.clauses == null || child == null)
+            if (IsLeaf || this.clauses == null || child == null)
             {
                 throw new ArgumentException(NLS
                     .GetLocalizedMessage(QueryParserMessages.NODE_ACTION_NOT_SUPPORTED));
@@ -60,7 +60,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         public void Add(IList<IQueryNode> children)
         {
 
-            if (IsLeaf() || this.clauses == null)
+            if (IsLeaf || this.clauses == null)
             {
                 throw new ArgumentException(NLS
                     .GetLocalizedMessage(QueryParserMessages.NODE_ACTION_NOT_SUPPORTED));
@@ -74,16 +74,16 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         }
 
 
-        public virtual bool IsLeaf()
+        public virtual bool IsLeaf
         {
-            return this.isLeaf;
+            get { return this.isLeaf; }
         }
 
 
         public void Set(IList<IQueryNode> children)
         {
 
-            if (IsLeaf() || this.clauses == null)
+            if (IsLeaf || this.clauses == null)
             {
                 //ResourceBundle bundle = ResourceBundle
                 //    .getBundle("org.apache.lucene.queryParser.messages.QueryParserMessages");
@@ -101,7 +101,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
                 child.RemoveFromParent();
             }
 
-            List<IQueryNode> existingChildren = new List<IQueryNode>(GetChildren());
+            // LUCENENET specific: GetChildren already creates a new list, there is
+            // no need to do it again here and have another O(n) operation
+            IList<IQueryNode> existingChildren = GetChildren();
             foreach (IQueryNode existingChild in existingChildren)
             {
                 existingChild.RemoveFromParent();
@@ -155,7 +157,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         public IList<IQueryNode> GetChildren()
         {
-            if (IsLeaf() || this.clauses == null)
+            if (IsLeaf || this.clauses == null)
             {
                 return null;
             }
@@ -197,14 +199,14 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         }
 
 
-        public virtual IQueryNode GetParent()
+        public virtual IQueryNode Parent
         {
-            return this.parent;
+            get { return this.parent; }
         }
 
-        protected virtual bool IsRoot()
+        protected virtual bool IsRoot
         {
-            return GetParent() == null;
+            get { return Parent == null; }
         }
 
         /**
@@ -252,9 +254,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
          * 
          * @return a map containing all tags attached to this query node
          */
-        public virtual IDictionary<string, object> GetTagMap()
+        public virtual IDictionary<string, object> TagMap
         {
-            return new Dictionary<string, object>(this.tags);
+            get { return new Dictionary<string, object>(this.tags); }
         }
 
         public virtual void RemoveFromParent()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/RangeQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/RangeQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/RangeQueryNode.cs
index 6e64892..58b480a 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/RangeQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/RangeQueryNode.cs
@@ -17,10 +17,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         T LowerBound { get; }
 
         T UpperBound { get; }
-
-        bool IsLowerInclusive { get; }
-
-        bool IsUpperInclusive { get; }
     }
 
     /// <summary>
@@ -28,5 +24,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
     /// RangeQueryNode without specifying its generic closing type
     /// </summary>
     public interface IRangeQueryNode
-    { }
+    {
+        bool IsLowerInclusive { get; }
+
+        bool IsUpperInclusive { get; }
+    }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/SlopQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/SlopQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/SlopQueryNode.cs
index daf2dbb..20daf9f 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/SlopQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/SlopQueryNode.cs
@@ -48,9 +48,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
             return GetChildren()[0];
         }
 
-        public virtual int GetValue()
+        public virtual int Value
         {
-            return this.value;
+            get { return this.value; }
         }
 
         private string GetValueString()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/TokenizedPhraseQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/TokenizedPhraseQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/TokenizedPhraseQueryNode.cs
index 6a4d98e..58f19ab 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/TokenizedPhraseQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/TokenizedPhraseQueryNode.cs
@@ -22,11 +22,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         public override string ToString()
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "<tokenizedphrase/>";
             StringBuilder sb = new StringBuilder();
             sb.Append("<tokenizedtphrase>");
-            foreach (IQueryNode child in GetChildren())
+            foreach (IQueryNode child in children)
             {
                 sb.Append("\n");
                 sb.Append(child.ToString());
@@ -39,12 +40,13 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
         public override string ToQueryString(IEscapeQuerySyntax escapeSyntaxParser)
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "";
 
             StringBuilder sb = new StringBuilder();
             string filler = "";
-            foreach (IQueryNode child in GetChildren())
+            foreach (IQueryNode child in children)
             {
                 sb.Append(filler).Append(child.ToQueryString(escapeSyntaxParser));
                 filler = ",";
@@ -85,19 +87,16 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 
                 if (children != null)
                 {
-
-                    foreach (IQueryNode child in GetChildren())
+                    foreach (IQueryNode child in children)
                     {
 
                         if (child is IFieldableNode)
                         {
                             ((IFieldableNode)child).Field = value;
                         }
-
                     }
                 }
             }
         }
-
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/Processors/RemoveDeletedQueryNodesProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Processors/RemoveDeletedQueryNodesProcessor.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Processors/RemoveDeletedQueryNodesProcessor.cs
index 95214f9..ef3fa43 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Processors/RemoveDeletedQueryNodesProcessor.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Processors/RemoveDeletedQueryNodesProcessor.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Processors
         protected override IQueryNode PostProcessNode(IQueryNode node)
         {
 
-            if (!node.IsLeaf())
+            if (!node.IsLeaf)
             {
                 IList<IQueryNode> children = node.GetChildren();
                 bool removeBoolean = false;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeParseException.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeParseException.cs b/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeParseException.cs
index b02fae1..d5ad632 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeParseException.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeParseException.cs
@@ -48,23 +48,18 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
                 QueryParserMessages.INVALID_SYNTAX_CANNOT_PARSE, query, "");
         }
 
-        public virtual string GetQuery()
+        public virtual string Query
         {
-            return this.query;
+            get { return this.query; }
         }
 
-        /**
-         * @param errorToken
-         *          the errorToken in the query
-         */
-        protected virtual void SetErrorToken(string errorToken)
-        {
-            this.errorToken = errorToken;
-        }
-
-        public virtual string GetErrorToken()
+        /// <summary>
+        /// The errorToken in the query
+        /// </summary>
+        public virtual string ErrorToken
         {
-            return this.errorToken;
+            get { return this.errorToken; }
+            protected set { this.errorToken = value; }
         }
 
         public virtual void SetNonLocalizedMessage(IMessage message)
@@ -79,9 +74,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
          * 
          * @return line where the problem was found
          */
-        public virtual int GetBeginLine()
+        public virtual int BeginLine
         {
-            return this.beginLine;
+            get { return this.beginLine; }
+            protected set { this.beginLine = value; }
         }
 
         /**
@@ -91,27 +87,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
          * 
          * @return column of the first char where the problem was found
          */
-        public virtual int GetBeginColumn()
-        {
-            return this.beginColumn;
-        }
-
-        /**
-         * @param beginLine
-         *          the beginLine to set
-         */
-        protected virtual void SetBeginLine(int beginLine)
-        {
-            this.beginLine = beginLine;
-        }
-
-        /**
-         * @param beginColumn
-         *          the beginColumn to set
-         */
-        protected virtual void SetBeginColumn(int beginColumn)
+        public virtual int BeginColumn
         {
-            this.beginColumn = beginColumn;
+            get { return this.beginColumn; }
+            protected set { this.beginColumn = value; }
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Core/QueryParserHelper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/QueryParserHelper.cs b/src/Lucene.Net.QueryParser/Flexible/Core/QueryParserHelper.cs
index ff8f98a..73e582b 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/QueryParserHelper.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/QueryParserHelper.cs
@@ -23,7 +23,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
     /// <seealso cref="IQueryNodeProcessor"/>
     /// <seealso cref="ISyntaxParser"/>
     /// <seealso cref="QueryBuilder"/>
-    /// <seealso cref="QueryConfigHandler"/>
+    /// <seealso cref="Config.QueryConfigHandler"/>
     public class QueryParserHelper<TQuery> // LUCENENET: Made this class generic so we can avoid the cast (to Query) on the Parse method
     {
         private IQueryNodeProcessor processor;
@@ -78,9 +78,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
          * @see QueryNodeProcessor
          * @see #setQueryNodeProcessor(QueryNodeProcessor)
          */
-        public virtual IQueryNodeProcessor GetQueryNodeProcessor()
+        public virtual IQueryNodeProcessor QueryNodeProcessor
         {
-            return processor;
+            get { return processor; }
         }
 
         /**
@@ -100,7 +100,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
         public virtual void SetQueryNodeProcessor(IQueryNodeProcessor processor)
         {
             this.processor = processor;
-            this.processor.SetQueryConfigHandler(GetQueryConfigHandler());
+            this.processor.SetQueryConfigHandler(QueryConfigHandler);
 
         }
 
@@ -158,9 +158,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
          * @see QueryConfigHandler
          * @see #setQueryConfigHandler(QueryConfigHandler)
          */
-        public virtual QueryConfigHandler GetQueryConfigHandler()
+        public virtual QueryConfigHandler QueryConfigHandler
         {
-            return config;
+            get { return config; }
         }
 
         /**
@@ -173,9 +173,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
          * @see #setQueryBuilder(QueryBuilder)
          * @see QueryBuilder
          */
-        public virtual IQueryBuilder<TQuery> GetQueryBuilder()
+        public virtual IQueryBuilder<TQuery> QueryBuilder
         {
-            return this.builder;
+            get { return this.builder; }
         }
 
         /**
@@ -188,9 +188,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
          * @see SyntaxParser
          * @see #setSyntaxParser(SyntaxParser)
          */
-        public virtual ISyntaxParser GetSyntaxParser()
+        public virtual ISyntaxParser SyntaxParser
         {
-            return this.syntaxParser;
+            get { return this.syntaxParser; }
         }
 
         /**
@@ -208,7 +208,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
         public virtual void SetQueryConfigHandler(QueryConfigHandler config)
         {
             this.config = config;
-            IQueryNodeProcessor processor = GetQueryNodeProcessor();
+            IQueryNodeProcessor processor = QueryNodeProcessor;
 
             if (processor != null)
             {
@@ -244,16 +244,16 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
          */
         public virtual /*object*/ TQuery Parse(string query, string defaultField)
         {
-            IQueryNode queryTree = GetSyntaxParser().Parse(query, defaultField);
+            IQueryNode queryTree = SyntaxParser.Parse(query, defaultField);
 
-            IQueryNodeProcessor processor = GetQueryNodeProcessor();
+            IQueryNodeProcessor processor = QueryNodeProcessor;
 
             if (processor != null)
             {
                 queryTree = processor.Process(queryTree);
             }
 
-            return GetQueryBuilder().Build(queryTree);
+            return QueryBuilder.Build(queryTree);
 
         }
     }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Messages/NLS.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Messages/NLS.cs b/src/Lucene.Net.QueryParser/Flexible/Messages/NLS.cs
index 94f6b53..30f31d8 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Messages/NLS.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Messages/NLS.cs
@@ -152,11 +152,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Messages
             for (int i = 0; i < len; i++)
             {
                 fields[fieldArray[i].Name] = fieldArray[i];
-                loadfieldValue(fieldArray[i], /*isFieldAccessible,*/ clazz);
+                LoadFieldValue(fieldArray[i], /*isFieldAccessible,*/ clazz);
             }
         }
 
-        private static void loadfieldValue(FieldInfo field, Type clazz)
+        private static void LoadFieldValue(FieldInfo field, Type clazz)
         {
             field.SetValue(null, field.Name);
             ValidateMessage(field.Name, clazz);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Precedence/PrecedenceQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Precedence/PrecedenceQueryParser.cs b/src/Lucene.Net.QueryParser/Flexible/Precedence/PrecedenceQueryParser.cs
index e1583cb..8a8633c 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Precedence/PrecedenceQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Precedence/PrecedenceQueryParser.cs
@@ -26,7 +26,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Precedence
    */
         public PrecedenceQueryParser()
         {
-            SetQueryNodeProcessor(new PrecedenceQueryNodeProcessorPipeline(GetQueryConfigHandler()));
+            SetQueryNodeProcessor(new PrecedenceQueryNodeProcessorPipeline(QueryConfigHandler));
         }
 
         /**
@@ -35,7 +35,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Precedence
         public PrecedenceQueryParser(Analyzer analyer)
             : base(analyer)
         {
-            SetQueryNodeProcessor(new PrecedenceQueryNodeProcessorPipeline(GetQueryConfigHandler()));
+            SetQueryNodeProcessor(new PrecedenceQueryNodeProcessorPipeline(QueryConfigHandler));
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Precedence/Processors/BooleanModifiersQueryNodeProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Precedence/Processors/BooleanModifiersQueryNodeProcessor.cs b/src/Lucene.Net.QueryParser/Flexible/Precedence/Processors/BooleanModifiersQueryNodeProcessor.cs
index 45ed21f..02fd07b 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Precedence/Processors/BooleanModifiersQueryNodeProcessor.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Precedence/Processors/BooleanModifiersQueryNodeProcessor.cs
@@ -99,7 +99,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Precedence.Processors
             {
                 ModifierQueryNode modNode = (ModifierQueryNode)node;
 
-                if (modNode.GetModifier() == Modifier.MOD_NONE)
+                if (modNode.Modifier == Modifier.MOD_NONE)
                 {
                     return new ModifierQueryNode(modNode.GetChild(), mod);
                 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/AnyQueryNodeBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/AnyQueryNodeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/AnyQueryNodeBuilder.cs
index 142a88e..d30a524 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/AnyQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/AnyQueryNodeBuilder.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             }
 
-            bQuery.MinimumNumberShouldMatch = andNode.GetMinimumMatchingElements();
+            bQuery.MinimumNumberShouldMatch = andNode.MinimumMatchingElements;
 
             return bQuery;
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 81576d3..8aae6e7 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BooleanQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BooleanQueryNodeBuilder.cs
@@ -88,7 +88,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             if (node is ModifierQueryNode)
             {
                 ModifierQueryNode mNode = ((ModifierQueryNode)node);
-                switch (mNode.GetModifier())
+                switch (mNode.Modifier)
                 {
 
                     case Modifier.MOD_REQ:

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 82a5ac9..4021391 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BoostQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/BoostQueryNodeBuilder.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
         public virtual Query Build(IQueryNode queryNode)
         {
             BoostQueryNode boostNode = (BoostQueryNode)queryNode;
-            IQueryNode child = boostNode.GetChild();
+            IQueryNode child = boostNode.Child;
 
             if (child == null)
             {
@@ -34,7 +34,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             Query query = (Query)child
                 .GetTag(QueryTreeBuilder<Query>.QUERY_TREE_BUILDER_TAGID);
-            query.Boost = boostNode.GetValue();
+            query.Boost = boostNode.Value;
 
             return query;
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 77b43c0..bba33b4 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FuzzyQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/FuzzyQueryNodeBuilder.cs
@@ -28,12 +28,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             string text = fuzzyNode.GetTextAsString();
 
 
-            int numEdits = FuzzyQuery.FloatToEdits(fuzzyNode.GetSimilarity(),
+            int numEdits = FuzzyQuery.FloatToEdits(fuzzyNode.Similarity,
                 text.CodePointCount(0, text.Length));
 
             return new FuzzyQuery(new Term(fuzzyNode.GetFieldAsString(), fuzzyNode
                 .GetTextAsString()), numEdits, fuzzyNode
-                .GetPrefixLength());
+                .PrefixLength);
 
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 81007e6..e0eea41 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MultiPhraseQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/MultiPhraseQueryNodeBuilder.cs
@@ -46,10 +46,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
                     //List<Term> termList = positionTermMap[termNode.GetPositionIncrement()];
                     //if (termList == null)
                     List<Term> termList;
-                    if (!positionTermMap.TryGetValue(termNode.GetPositionIncrement(), out termList) || termList == null)
+                    if (!positionTermMap.TryGetValue(termNode.PositionIncrement, out termList) || termList == null)
                     {
                         termList = new List<Term>();
-                        positionTermMap[termNode.GetPositionIncrement()] = termList;
+                        positionTermMap[termNode.PositionIncrement] = termList;
 
                     }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 911aaea..b616069 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/NumericRangeQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/NumericRangeQueryNodeBuilder.cs
@@ -44,12 +44,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             /*Number*/
             object upperNumber = upperNumericNode.Value;
 
-            NumericConfig numericConfig = numericRangeNode.GetNumericConfig();
-            FieldType.NumericType numberType = numericConfig.GetType();
+            NumericConfig numericConfig = numericRangeNode.NumericConfig;
+            FieldType.NumericType numberType = numericConfig.Type;
             string field = StringUtils.ToString(numericRangeNode.Field);
             bool minInclusive = numericRangeNode.IsLowerInclusive;
             bool maxInclusive = numericRangeNode.IsUpperInclusive;
-            int precisionStep = numericConfig.GetPrecisionStep();
+            int precisionStep = numericConfig.PrecisionStep;
 
             switch (numberType)
             {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 15343cc..3683797 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PhraseQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/PhraseQueryNodeBuilder.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
                         .GetTag(QueryTreeBuilder<Query>.QUERY_TREE_BUILDER_TAGID);
                     FieldQueryNode termNode = (FieldQueryNode)child;
 
-                    phraseQuery.Add(termQuery.Term, termNode.GetPositionIncrement());
+                    phraseQuery.Add(termQuery.Term, termNode.PositionIncrement);
 
                 }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 c138d8b..1811d76 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/RegexpQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/RegexpQueryNodeBuilder.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
         {
             RegexpQueryNode regexpNode = (RegexpQueryNode)queryNode;
 
-            RegexpQuery q = new RegexpQuery(new Term(regexpNode.FieldAsString,
+            RegexpQuery q = new RegexpQuery(new Term(regexpNode.GetFieldAsString(),
                 regexpNode.TextToBytesRef()));
 
             MultiTermQuery.RewriteMethod method = (MultiTermQuery.RewriteMethod)queryNode

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 caeb118..13d1fa0 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/SlopQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/SlopQueryNodeBuilder.cs
@@ -32,12 +32,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
 
             if (query is PhraseQuery)
             {
-                ((PhraseQuery)query).Slop = phraseSlopNode.GetValue();
+                ((PhraseQuery)query).Slop = phraseSlopNode.Value;
 
             }
             else
             {
-                ((MultiPhraseQuery)query).Slop = phraseSlopNode.GetValue();
+                ((MultiPhraseQuery)query).Slop = phraseSlopNode.Value;
             }
 
             return query;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 2c1031a..57f8b14 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardBooleanQueryNodeBuilder.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Builders/StandardBooleanQueryNodeBuilder.cs
@@ -86,7 +86,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Builders
             if (node is ModifierQueryNode)
             {
                 ModifierQueryNode mNode = ((ModifierQueryNode)node);
-                Modifier modifier = mNode.GetModifier();
+                Modifier modifier = mNode.Modifier;
 
                 if (Modifier.MOD_NONE.Equals(modifier))
                 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Standard/CommonQueryParserConfiguration.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/CommonQueryParserConfiguration.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/CommonQueryParserConfiguration.cs
index e2f5548..35ec103 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/CommonQueryParserConfiguration.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/CommonQueryParserConfiguration.cs
@@ -101,6 +101,6 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
         /// Sets the default <see cref="T:DateTools.Resolution"/> used for certain field when
         /// no <see cref="T:DateTools.Resolution"/> is defined for this field.
         /// </summary>
-        void SetDateResolution(DateTools.Resolution dateResolution); // LUCENENET TODO: Make into property set
+        void SetDateResolution(DateTools.Resolution dateResolution);
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 02db0f5..6758c8f 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldBoostMapFCListener.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldBoostMapFCListener.cs
@@ -34,7 +34,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
             if (fieldBoostMap != null)
             {
                 float? boost;// = fieldBoostMap.Get(fieldConfig.GetField());
-                fieldBoostMap.TryGetValue(fieldConfig.GetField(), out boost);
+                fieldBoostMap.TryGetValue(fieldConfig.Field, out boost);
 
                 if (boost != null)
                 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 10c8403..edfdb4d 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldDateResolutionFCListener.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FieldDateResolutionFCListener.cs
@@ -35,7 +35,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
 
             if (dateResMap != null)
             {
-                dateResMap.TryGetValue(fieldConfig.GetField(), out dateRes);
+                dateResMap.TryGetValue(fieldConfig.Field, out dateRes);
 
                 //dateRes = dateResMap.Get(
                 //    fieldConfig.GetField());

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FuzzyConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FuzzyConfig.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FuzzyConfig.cs
index f5c8132..43e4021 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FuzzyConfig.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/FuzzyConfig.cs
@@ -18,24 +18,16 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
 
         public FuzzyConfig() { }
 
-        public virtual int GetPrefixLength()
+        public virtual int PrefixLength
         {
-            return prefixLength;
+            get { return prefixLength; }
+            set { this.prefixLength = value; }
         }
 
-        public virtual void SetPrefixLength(int prefixLength)
+        public virtual float MinSimilarity
         {
-            this.prefixLength = prefixLength;
-        }
-
-        public virtual float GetMinSimilarity()
-        {
-            return minSimilarity;
-        }
-
-        public virtual void SetMinSimilarity(float minSimilarity)
-        {
-            this.minSimilarity = minSimilarity;
+            get { return minSimilarity; }
+            set { this.minSimilarity = value; }
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 cf8a94d..1147a6d 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericConfig.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericConfig.cs
@@ -39,97 +39,56 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
         public NumericConfig(int precisionStep, /*NumberFormat*/ string format,
             NumericType type)
         {
-            SetPrecisionStep(precisionStep);
-            SetNumberFormat(format);
-            SetType(type);
-
+            PrecisionStep = precisionStep;
+            NumberFormat = format;
+            Type = type;
         }
 
         /**
-         * Returns the precision used to index the numeric values
+         * Gets or sets the precision used to index the numeric values
          * 
          * @return the precision used to index the numeric values
          * 
          * @see NumericRangeQuery#getPrecisionStep()
          */
-        public virtual int GetPrecisionStep()
-        {
-            return precisionStep;
-        }
-
-        /**
-         * Sets the precision used to index the numeric values
-         * 
-         * @param precisionStep
-         *          the precision used to index the numeric values
-         * 
-         * @see NumericRangeQuery#getPrecisionStep()
-         */
-        public virtual void SetPrecisionStep(int precisionStep)
+        public virtual int PrecisionStep
         {
-            this.precisionStep = precisionStep;
+            get { return precisionStep; }
+            set { precisionStep = value; }
         }
 
         /**
-         * Returns the {@link NumberFormat} used to parse a {@link String} to
-         * {@link Number}
+         * Gets or Sets the {@link NumberFormat} used to parse a {@link String} to
+         * {@link Number}, cannot be <code>null</code>
          * 
          * @return the {@link NumberFormat} used to parse a {@link String} to
          *         {@link Number}
          */
-        public virtual /*NumberFormat*/ string GetNumberFormat()
-        {
-            return format;
-        }
-
-        /**
-         * Returns the numeric type used to index the numeric values
-         * 
-         * @return the numeric type used to index the numeric values
-         */
-        public virtual NumericType GetType()
+        public virtual /*NumberFormat*/ string NumberFormat
         {
-            return type;
-        }
-
-        /**
-         * Sets the numeric type used to index the numeric values
-         * 
-         * @param type the numeric type used to index the numeric values
-         */
-        public virtual void SetType(NumericType type)
-        {
-
-            //if (type == null)
-            //{
-            //    throw new ArgumentException("type cannot be null!");
-            //}
-
-            this.type = type;
+            get { return format; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentException("format cannot be null!");
+                }
 
+                this.format = value;
+            }
         }
 
         /**
-         * Sets the {@link NumberFormat} used to parse a {@link String} to
-         * {@link Number}
+         * Gets or Sets the numeric type used to index the numeric values
          * 
-         * @param format
-         *          the {@link NumberFormat} used to parse a {@link String} to
-         *          {@link Number}, cannot be <code>null</code>
+         * @return the numeric type used to index the numeric values
          */
-        public virtual void SetNumberFormat(/*NumberFormat*/ string format)
+        public virtual NumericType Type
         {
-
-            if (format == null)
-            {
-                throw new ArgumentException("format cannot be null!");
-            }
-
-            this.format = format;
-
+            get { return type; }
+            set { type = value; }
         }
 
-
         public override bool Equals(object obj)
         {
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 65c4c2b..b419bc6 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericFieldConfigListener.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/NumericFieldConfigListener.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
 
 
                 //if (numericConfig != null)
-                if (numericConfigMap.TryGetValue(fieldConfig.GetField(), out numericConfig) && 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/0aa30ca8/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 f111313..83b23bd 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/MultiPhraseQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/MultiPhraseQueryNode.cs
@@ -23,11 +23,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
 
         public override string ToString()
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "<multiPhrase/>";
             StringBuilder sb = new StringBuilder();
             sb.Append("<multiPhrase>");
-            foreach (IQueryNode child in GetChildren())
+            foreach (IQueryNode child in children)
             {
                 sb.Append("\n");
                 sb.Append(child.ToString());
@@ -39,12 +40,13 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
 
         public override string ToQueryString(IEscapeQuerySyntax escapeSyntaxParser)
         {
-            if (GetChildren() == null || GetChildren().Count == 0)
+            var children = GetChildren();
+            if (children == null || children.Count == 0)
                 return "";
 
             StringBuilder sb = new StringBuilder();
             string filler = "";
-            foreach (IQueryNode child in GetChildren())
+            foreach (IQueryNode child in children)
             {
                 sb.Append(filler).Append(child.ToQueryString(escapeSyntaxParser));
                 filler = ",";

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 2a40158..01526f3 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericQueryNode.cs
@@ -37,7 +37,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             /*NumberFormat*/ string numberFormat)
             : base()
         {
-            SetNumberFormat(numberFormat);
+            NumberFormat = numberFormat;
             Field = field;
             Value = value;
 
@@ -94,27 +94,18 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         }
 
         /**
-         * Sets the {@link NumberFormat} used to convert the value to {@link String}.
-         * 
-         * @param format the {@link NumberFormat} used to convert the value to {@link String}
-         */
-        public virtual void SetNumberFormat(/*NumberFormat*/ string format)
-        {
-            this.numberFormat = format;
-        }
-
-        /**
-         * Returns the {@link NumberFormat} used to convert the value to {@link String}.
+         * Gets or Sets the {@link NumberFormat} used to convert the value to {@link String}.
          * 
          * @return the {@link NumberFormat} used to convert the value to {@link String}
          */
-        public virtual /*NumberFormat*/ string GetNumberFormat()
+        public virtual /*NumberFormat*/ string NumberFormat
         {
-            return this.numberFormat;
+            get { return this.numberFormat; }
+            set { this.numberFormat = value; }
         }
 
         /**
-         * Returns the numeric value as {@link Number}.
+         * Gets or Sets the numeric value as {@link Number}.
          * 
          * @return the numeric value
          */

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 9565a94..64d09cf 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs
@@ -109,19 +109,19 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             }
 
             if (lowerNumberType != null
-                && !lowerNumberType.Equals(numericConfig.GetType()))
+                && !lowerNumberType.Equals(numericConfig.Type))
             {
                 throw new ArgumentException(
                     "lower value's type should be the same as numericConfig type: "
-                        + lowerNumberType + " != " + numericConfig.GetType());
+                        + lowerNumberType + " != " + numericConfig.Type);
             }
 
             if (upperNumberType != null
-                && !upperNumberType.Equals(numericConfig.GetType()))
+                && !upperNumberType.Equals(numericConfig.Type))
             {
                 throw new ArgumentException(
                     "upper value's type should be the same as numericConfig type: "
-                        + upperNumberType + " != " + numericConfig.GetType());
+                        + upperNumberType + " != " + numericConfig.Type);
             }
 
             base.SetBounds(lower, upper, lowerInclusive, upperInclusive);
@@ -134,9 +134,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
          * 
          * @return the {@link NumericConfig} associated with the lower and upper bounds
          */
-        public virtual NumericConfig GetNumericConfig()
+        public virtual NumericConfig NumericConfig
         {
-            return this.numericConfig;
+            get { return this.numericConfig; }
         }
 
 
@@ -146,8 +146,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
 
             sb.Append(IsLowerInclusive).Append("' upperInclusive='").Append(
                 IsUpperInclusive).Append(
-                "' precisionStep='" + numericConfig.GetPrecisionStep()).Append(
-                "' type='" + numericConfig.GetType()).Append("'>\n");
+                "' precisionStep='" + numericConfig.PrecisionStep).Append(
+                "' type='" + numericConfig.Type).Append("'>\n");
 
             sb.Append(LowerBound).Append('\n');
             sb.Append(UpperBound).Append('\n');

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 d76bafe..dd79211 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         }
 
         public PrefixWildcardQueryNode(FieldQueryNode fqn)
-            : this(fqn.Field, fqn.Text, fqn.GetBegin(), fqn.GetEnd())
+            : this(fqn.Field, fqn.Text, fqn.Begin, fqn.End)
         {
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 a1e0d75..4fc079b 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs
@@ -85,9 +85,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
             set { this.field = value; }
         }
 
-        public virtual string FieldAsString
+        public virtual string GetFieldAsString()
         {
-            get { return field.ToString(); }
+            return field.ToString();
         }
 
         public override string ToQueryString(IEscapeQuerySyntax escapeSyntaxParser)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 4ff25eb..e68817d 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         }
 
         public WildcardQueryNode(FieldQueryNode fqn)
-            : this(fqn.Field, fqn.Text, fqn.GetBegin(), fqn.GetEnd())
+            : this(fqn.Field, fqn.Text, fqn.Begin, fqn.End)
         {
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0aa30ca8/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 0e392a2..2cd0b49 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/CharStream.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/CharStream.cs
@@ -35,7 +35,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
          * @deprecated
          * @see #getEndColumn
          */
-        int GetColumn();
+        int Column { get; }
 
         [Obsolete]
         /**
@@ -43,31 +43,31 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
          * @deprecated
          * @see #getEndLine
          */
-        int GetLine();
+        int Line { get; }
 
         /**
          * Returns the column number of the last character for current token (being
          * matched after the last call to BeginTOken).
          */
-        int GetEndColumn();
+        int EndColumn { get; }
 
         /**
          * Returns the line number of the last character for current token (being
          * matched after the last call to BeginTOken).
          */
-        int GetEndLine();
+        int EndLine { get; }
 
         /**
          * Returns the column number of the first character for current token (being
          * matched after the last call to BeginTOken).
          */
-        int GetBeginColumn();
+        int BeginColumn { get; }
 
         /**
          * Returns the line number of the first character for current token (being
          * matched after the last call to BeginTOken).
          */
-        int GetBeginLine();
+        int BeginLine { get; }
 
         /**
          * Backs up the input stream by amount steps. Lexer calls this method if it


Mime
View raw message