Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 31215200C5F for ; Thu, 16 Mar 2017 00:49:54 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2FE2E160B8D; Wed, 15 Mar 2017 23:49:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CD898160B92 for ; Thu, 16 Mar 2017 00:49:52 +0100 (CET) Received: (qmail 45384 invoked by uid 500); 15 Mar 2017 23:49:46 -0000 Mailing-List: contact commits-help@lucenenet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucenenet.apache.org Delivered-To: mailing list commits@lucenenet.apache.org Received: (qmail 43077 invoked by uid 99); 15 Mar 2017 23:49:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Mar 2017 23:49:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 86D58F4B7C; Wed, 15 Mar 2017 23:49:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nightowl888@apache.org To: commits@lucenenet.apache.org Date: Wed, 15 Mar 2017 23:50:32 -0000 Message-Id: <942a9d97fb694e60a9b01a1c427ea500@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [50/50] [abbrv] lucenenet git commit: Lucene.Net.Analysis.Common.Util.ResourceLoader refactor: Renamed FindClass() > FindType() archived-at: Wed, 15 Mar 2017 23:49:54 -0000 Lucene.Net.Analysis.Common.Util.ResourceLoader refactor: Renamed FindClass() > FindType() Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/467a488c Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/467a488c Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/467a488c Branch: refs/heads/api-work Commit: 467a488cef99bc3becf9297dd13a56fee3fdd87d Parents: 85b18d2 Author: Shad Storhaug Authored: Thu Mar 16 06:45:42 2017 +0700 Committer: Shad Storhaug Committed: Thu Mar 16 06:45:42 2017 +0700 ---------------------------------------------------------------------- .../Analysis/Synonym/FSTSynonymFilterFactory.cs | 4 ++-- .../Analysis/Synonym/SlowSynonymFilterFactory.cs | 2 +- .../Analysis/Util/ClasspathResourceLoader.cs | 4 ++-- .../Analysis/Util/FilesystemResourceLoader.cs | 4 ++-- src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs | 4 +++- src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs | 2 +- .../Analysis/Synonym/TestSynonymMap.cs | 2 +- .../Analysis/Util/StringMockResourceLoader.cs | 4 ++-- 8 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/467a488c/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs index d24bbe3..725e498 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs @@ -127,7 +127,7 @@ namespace Lucene.Net.Analysis.Synonym Encoding decoder = Encoding.UTF8; SynonymMap.Parser parser; - Type clazz = loader.FindClass(cname /*, typeof(SynonymMap.Parser) */); + Type clazz = loader.FindType(cname /*, typeof(SynonymMap.Parser) */); try { parser = (SynonymMap.Parser)Activator.CreateInstance(clazz, new object[] { dedup, expand, analyzer }); @@ -155,7 +155,7 @@ namespace Lucene.Net.Analysis.Synonym // (there are no tests for this functionality) private TokenizerFactory LoadTokenizerFactory(IResourceLoader loader, string cname) { - Type clazz = loader.FindClass(cname /*, typeof(TokenizerFactory) */); + Type clazz = loader.FindType(cname /*, typeof(TokenizerFactory) */); try { TokenizerFactory tokFactory = (TokenizerFactory)Activator.CreateInstance(clazz, new object[] { tokArgs }); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/467a488c/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilterFactory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilterFactory.cs index 6775edd..691b794 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilterFactory.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilterFactory.cs @@ -201,7 +201,7 @@ namespace Lucene.Net.Analysis.Synonym private TokenizerFactory LoadTokenizerFactory(IResourceLoader loader, string cname) { - Type clazz = loader.FindClass(cname); + Type clazz = loader.FindType(cname); try { TokenizerFactory tokFactory = (TokenizerFactory)Activator.CreateInstance(clazz, new object[] { tokArgs }); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/467a488c/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs index 40434f3..19abbd8 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs @@ -70,7 +70,7 @@ namespace Lucene.Net.Analysis.Util return stream; } - public Type FindClass(string cname) + public Type FindType(string cname) { try { @@ -94,7 +94,7 @@ namespace Lucene.Net.Analysis.Util public T NewInstance(string cname) { - Type clazz = FindClass(cname); + Type clazz = FindType(cname); try { return (T)Activator.CreateInstance(clazz); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/467a488c/src/Lucene.Net.Analysis.Common/Analysis/Util/FilesystemResourceLoader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/FilesystemResourceLoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/FilesystemResourceLoader.cs index 275d335..94751f8 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Util/FilesystemResourceLoader.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/FilesystemResourceLoader.cs @@ -133,9 +133,9 @@ namespace Lucene.Net.Analysis.Util return @delegate.NewInstance(cname); } - public Type FindClass(string cname) + public Type FindType(string cname) { - return @delegate.FindClass(cname); + return @delegate.FindType(cname); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/467a488c/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs index 7c472bc..a00bd16 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs @@ -32,8 +32,10 @@ namespace Lucene.Net.Analysis.Util /// /// Finds class of the name + /// + /// NOTE: This was findClass() in Lucene /// - Type FindClass(string cname); // LUCENENET TODO: Rename FindType ? + Type FindType(string cname); /// /// Creates an instance of the name and expected type http://git-wip-us.apache.org/repos/asf/lucenenet/blob/467a488c/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs index d4612ff..3ea4443 100644 --- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs +++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs @@ -1032,7 +1032,7 @@ namespace Lucene.Net.Store startFiles = startSet.ToArray(/*new string[0]*/); endFiles = endSet.ToArray(/*new string[0]*/); - if (!Arrays.Equals(startFiles, endFiles)) // LUCENENET TODO: Possible equals ordinal issue + if (!Arrays.Equals(startFiles, endFiles)) { IList removed = new List(); foreach (string fileName in startFiles) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/467a488c/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs index a657a33..d339b4e 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs @@ -297,7 +297,7 @@ namespace Lucene.Net.Analysis.Synonym throw new Exception("stub"); } - public Type FindClass(string cname) + public Type FindType(string cname) { throw new Exception("stub"); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/467a488c/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/StringMockResourceLoader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/StringMockResourceLoader.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/StringMockResourceLoader.cs index 3c828c4..5a597ea 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/StringMockResourceLoader.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/StringMockResourceLoader.cs @@ -32,7 +32,7 @@ namespace Lucene.Net.Analysis.Util this.text = text; } - public Type FindClass(string cname) + public Type FindType(string cname) { try { @@ -46,7 +46,7 @@ namespace Lucene.Net.Analysis.Util public T NewInstance(string cname) { - Type clazz = FindClass(cname); + Type clazz = FindType(cname); try { return (T)Activator.CreateInstance(clazz);