You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2015/04/14 01:04:13 UTC
lucenenet git commit: Various fixes
Repository: lucenenet
Updated Branches:
refs/heads/master c83d8e80a -> e670c1e76
Various fixes
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/e670c1e7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/e670c1e7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/e670c1e7
Branch: refs/heads/master
Commit: e670c1e764d6c2970ee2f746e776f60dac4a38b0
Parents: c83d8e8
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Tue Apr 14 02:03:58 2015 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Tue Apr 14 02:03:58 2015 +0300
----------------------------------------------------------------------
.../Analysis/Util/CharTokenizer.cs | 4 ++--
.../Analysis/Util/CharacterUtils.cs | 9 +++++----
src/Lucene.Net.Core/Index/IndexWriter.cs | 1 -
src/Lucene.Net.Core/Util/StringHelper.cs | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e670c1e7/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs
index d37b681..68c0d47 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs
@@ -64,7 +64,7 @@ namespace Lucene.Net.Analysis.Util
/// </summary>
public abstract class CharTokenizer : Tokenizer
{
- private readonly TextReader _input;
+ protected readonly TextReader _input;
/// <summary>
/// Creates a new <seealso cref="CharTokenizer"/> instance
@@ -91,7 +91,7 @@ namespace Lucene.Net.Analysis.Util
/// the attribute factory to use for this <seealso cref="Tokenizer"/> </param>
/// <param name="input">
/// the input to split up into tokens </param>
- public CharTokenizer(LuceneVersion matchVersion, AttributeFactory factory, TextReader input)
+ protected CharTokenizer(LuceneVersion matchVersion, AttributeFactory factory, TextReader input)
: base(factory, input)
{
_input = input;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e670c1e7/src/Lucene.Net.Analysis.Common/Analysis/Util/CharacterUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharacterUtils.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharacterUtils.cs
index 1a7ccc9..e0e9a78 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharacterUtils.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharacterUtils.cs
@@ -1,4 +1,5 @@
using System.Diagnostics;
+using System.IO;
using Lucene.Net.Support;
using Lucene.Net.Util;
using Reader = System.IO.TextReader;
@@ -32,8 +33,8 @@ namespace Lucene.Net.Analysis.Util
/// </summary>
public abstract class CharacterUtils
{
- private static readonly Java4CharacterUtils JAVA_4 = new Java4CharacterUtils();
- private static readonly Java5CharacterUtils JAVA_5 = new Java5CharacterUtils();
+ private static readonly CharacterUtils JAVA_4 = new Java4CharacterUtils();
+ private static readonly CharacterUtils JAVA_5 = new Java5CharacterUtils();
/// <summary>
/// Returns a <seealso cref="CharacterUtils"/> implementation according to the given
@@ -134,7 +135,7 @@ namespace Lucene.Net.Analysis.Util
Debug.Assert(offset <= 0 && offset <= buffer.Length);
for (int i = offset; i < limit;)
{
- i += Character.ToChars(char.ToLower(CodePointAt(buffer, i, limit)), buffer, i);
+ i += Character.ToChars(char.ToLower((char)CodePointAt(buffer, i, limit)), buffer, i);
}
}
@@ -150,7 +151,7 @@ namespace Lucene.Net.Analysis.Util
Debug.Assert(offset <= 0 && offset <= buffer.Length);
for (int i = offset; i < limit;)
{
- i += Character.ToChars(char.ToUpper(CodePointAt(buffer, i, limit)), buffer, i);
+ i += Character.ToChars(char.ToUpper((char)CodePointAt(buffer, i, limit)), buffer, i);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e670c1e7/src/Lucene.Net.Core/Index/IndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexWriter.cs b/src/Lucene.Net.Core/Index/IndexWriter.cs
index 7c4627b..b4ca4b0 100644
--- a/src/Lucene.Net.Core/Index/IndexWriter.cs
+++ b/src/Lucene.Net.Core/Index/IndexWriter.cs
@@ -3714,7 +3714,6 @@ namespace Lucene.Net.Index
/// you should immediately close the writer. See <a
/// href="#OOME">above</a> for details.</p>
/// </summary>
- /// <seealso cref= #prepareCommit </seealso>
public void Commit()
{
EnsureOpen();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e670c1e7/src/Lucene.Net.Core/Util/StringHelper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/StringHelper.cs b/src/Lucene.Net.Core/Util/StringHelper.cs
index fee7def..9a8dc3c 100644
--- a/src/Lucene.Net.Core/Util/StringHelper.cs
+++ b/src/Lucene.Net.Core/Util/StringHelper.cs
@@ -189,7 +189,7 @@ namespace Lucene.Net.Util
if (good_fast_hash_seed == 0)
{
//LUCENE TO-DO No idea if this works
- string prop = AppSettings.Get("tests.seed", "");
+ var prop = AppSettings.Get("tests.seed", null);
if (prop != null)
{
// So if there is a test failure that relied on hash