lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From synhers...@apache.org
Subject [01/34] lucenenet git commit: Changing naming to make porting of more stuff easier
Date Fri, 07 Nov 2014 23:12:05 GMT
Repository: lucenenet
Updated Branches:
  refs/heads/master 6d26b3c7e -> 997171765


Changing naming to make porting of more stuff easier


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

Branch: refs/heads/master
Commit: b8454a31334ec1a82afc48e4214d48aa89bbc95f
Parents: 6d26b3c
Author: Itamar Syn-Hershko <itamar@code972.com>
Authored: Sat Nov 8 00:53:27 2014 +0200
Committer: Itamar Syn-Hershko <itamar@code972.com>
Committed: Sat Nov 8 00:53:27 2014 +0200

----------------------------------------------------------------------
 src/Lucene.Net.Core/Analysis/Tokenizer.cs              | 13 +++++++------
 .../core/Analysis/TestGraphTokenizers.cs               |  2 +-
 src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs     |  2 +-
 src/Lucene.Net.Tests/core/Search/TestTermRangeQuery.cs |  2 +-
 src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs     |  4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b8454a31/src/Lucene.Net.Core/Analysis/Tokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Analysis/Tokenizer.cs b/src/Lucene.Net.Core/Analysis/Tokenizer.cs
index 11a2728..f4b7b7f 100644
--- a/src/Lucene.Net.Core/Analysis/Tokenizer.cs
+++ b/src/Lucene.Net.Core/Analysis/Tokenizer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using Lucene.Net.Util;
 
 namespace Lucene.Net.Analysis
 {
@@ -34,7 +35,7 @@ namespace Lucene.Net.Analysis
     {
         /// <summary>
         /// The text source for this Tokenizer. </summary>
-        protected internal TextReader Input = ILLEGAL_STATE_READER;
+        protected internal TextReader input = ILLEGAL_STATE_READER;
 
         /// <summary>
         /// Pending reader: not actually assigned to input until reset() </summary>
@@ -72,11 +73,11 @@ namespace Lucene.Net.Analysis
         /// </summary>
         public override void Dispose()
         {
-            Input.Close();
+            input.Close();
             // LUCENE-2387: don't hold onto Reader after close, so
             // GC can reclaim
             InputPending = ILLEGAL_STATE_READER;
-            Input = ILLEGAL_STATE_READER;
+            input = ILLEGAL_STATE_READER;
         }
 
         /// <summary>
@@ -87,7 +88,7 @@ namespace Lucene.Net.Analysis
         /// <seealso> cref= CharFilter#correctOffset </seealso>
         protected internal int CorrectOffset(int currentOff)
         {
-            return (Input is CharFilter) ? ((CharFilter)Input).CorrectOffset(currentOff)
: currentOff;
+            return (input is CharFilter) ? ((CharFilter)input).CorrectOffset(currentOff)
: currentOff;
         }
 
         /// <summary>
@@ -103,7 +104,7 @@ namespace Lucene.Net.Analysis
                 {
                     throw new System.NullReferenceException("input must not be null");
                 }
-                else if (this.Input != ILLEGAL_STATE_READER)
+                else if (this.input != ILLEGAL_STATE_READER)
                 {
                     //throw new Exception("TokenStream contract violation: close() call missing");
                 }
@@ -115,7 +116,7 @@ namespace Lucene.Net.Analysis
         public override void Reset()
         {
             base.Reset();
-            Input = InputPending;
+            input = InputPending;
             InputPending = ILLEGAL_STATE_READER;
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b8454a31/src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs b/src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs
index 23aac1d..4fe19b1 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs
@@ -120,7 +120,7 @@ namespace Lucene.Net.Analysis
                 char[] buffer = new char[256];
                 while (true)
                 {
-                    int count = Input.Read(buffer, 0, buffer.Length);
+                    int count = input.Read(buffer, 0, buffer.Length);
 
                     //.NET TextReader.Read(buff, int, int) returns 0, not -1 on no chars
                     if (count == 0)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b8454a31/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index 5b4ff59..a9801f3 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -1914,7 +1914,7 @@ namespace Lucene.Net.Index
                 StringBuilder b = new StringBuilder();
                 char[] buffer = new char[1024];
                 int n;
-                while ((n = Input.Read(buffer, 0, buffer.Length)) != -1)
+                while ((n = input.Read(buffer, 0, buffer.Length)) != -1)
                 {
                     b.Append(buffer, 0, n);
                 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b8454a31/src/Lucene.Net.Tests/core/Search/TestTermRangeQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTermRangeQuery.cs b/src/Lucene.Net.Tests/core/Search/TestTermRangeQuery.cs
index 186942b..e6541b1 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermRangeQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermRangeQuery.cs
@@ -241,7 +241,7 @@ namespace Lucene.Net.Search
                     }
                     else
                     {
-                        int count = Input.Read(Buffer, 0, Buffer.Length);
+                        int count = input.Read(Buffer, 0, Buffer.Length);
                         ClearAttributes();
                         Done = true;
                         if (count == 1)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b8454a31/src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs b/src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs
index e245bf1..0140fc0 100644
--- a/src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Analysis.Tokenattributes;
+´╗┐using Lucene.Net.Analysis.Tokenattributes;
 using NUnit.Framework;
 using System.IO;
 
@@ -220,7 +220,7 @@ namespace Lucene.Net.Util
 
             public override bool IncrementToken()
             {
-                int ch = Input.Read();
+                int ch = input.Read();
                 if (ch < 0)
                 {
                     return false;


Mime
View raw message