You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by di...@apache.org on 2011/04/26 14:49:35 UTC
[Lucene.Net] svn commit: r1096740 - in
/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core:
Analysis/MappingCharFilter.cs Analysis/NormalizeCharMap.cs
Analysis/PerFieldAnalyzerWrapper.cs Search/SloppyPhraseScorer.cs
SupportClass.cs
Author: digy
Date: Tue Apr 26 12:49:34 2011
New Revision: 1096740
URL: http://svn.apache.org/viewvc?rev=1096740&view=rev
Log:
[LUCENENET-412]
Modified:
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/MappingCharFilter.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/NormalizeCharMap.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/PerFieldAnalyzerWrapper.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/SloppyPhraseScorer.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/SupportClass.cs
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/MappingCharFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/MappingCharFilter.cs?rev=1096740&r1=1096739&r2=1096740&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/MappingCharFilter.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/MappingCharFilter.cs Tue Apr 26 12:49:34 2011
@@ -59,7 +59,7 @@ namespace Lucene.Net.Analysis
int firstChar = NextChar();
if (firstChar == - 1)
return - 1;
- NormalizeCharMap nm = normMap.submap != null?(NormalizeCharMap) normMap.submap[CharacterCache.ValueOf((char) firstChar)]:null;
+ NormalizeCharMap nm = normMap.submap != null?normMap.submap[CharacterCache.ValueOf((char) firstChar)]:null;
if (nm == null)
return firstChar;
NormalizeCharMap result = Match(nm);
@@ -123,7 +123,7 @@ namespace Lucene.Net.Analysis
int chr = NextChar();
if (chr != - 1)
{
- NormalizeCharMap subMap = (NormalizeCharMap) map.submap[CharacterCache.ValueOf((char) chr)];
+ NormalizeCharMap subMap = map.submap[CharacterCache.ValueOf((char) chr)];
if (subMap != null)
{
result = Match(subMap);
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/NormalizeCharMap.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/NormalizeCharMap.cs?rev=1096740&r1=1096739&r2=1096740&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/NormalizeCharMap.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/NormalizeCharMap.cs Tue Apr 26 12:49:34 2011
@@ -27,7 +27,7 @@ namespace Lucene.Net.Analysis
{
//Map<Character, NormalizeMap> submap;
- internal System.Collections.IDictionary submap;
+ internal SupportClass.Dictionary<char, NormalizeCharMap> submap;
internal System.String normStr;
internal int diff;
@@ -49,9 +49,9 @@ namespace Lucene.Net.Analysis
char c = singleMatch[i];
if (currMap.submap == null)
{
- currMap.submap = new System.Collections.Hashtable(1);
+ currMap.submap = new SupportClass.Dictionary<char, NormalizeCharMap>(1);
}
- NormalizeCharMap map = (NormalizeCharMap) currMap.submap[CharacterCache.ValueOf(c)];
+ NormalizeCharMap map = currMap.submap[CharacterCache.ValueOf(c)];
if (map == null)
{
map = new NormalizeCharMap();
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/PerFieldAnalyzerWrapper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/PerFieldAnalyzerWrapper.cs?rev=1096740&r1=1096739&r2=1096740&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/PerFieldAnalyzerWrapper.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Analysis/PerFieldAnalyzerWrapper.cs Tue Apr 26 12:49:34 2011
@@ -16,6 +16,7 @@
*/
using System;
+using System.Collections.Generic;
namespace Lucene.Net.Analysis
{
@@ -42,7 +43,7 @@ namespace Lucene.Net.Analysis
public class PerFieldAnalyzerWrapper:Analyzer
{
private Analyzer defaultAnalyzer;
- private System.Collections.IDictionary analyzerMap = new System.Collections.Hashtable();
+ private SupportClass.Dictionary<String, Analyzer> analyzerMap = new SupportClass.Dictionary<string, Analyzer>();
/// <summary> Constructs with default analyzer.
@@ -65,16 +66,12 @@ namespace Lucene.Net.Analysis
/// <param name="fieldAnalyzers">a Map (String field name to the Analyzer) to be
/// used for those fields
/// </param>
- public PerFieldAnalyzerWrapper(Analyzer defaultAnalyzer, System.Collections.IDictionary fieldAnalyzers)
+ public PerFieldAnalyzerWrapper(Analyzer defaultAnalyzer, IDictionary<string,Analyzer> fieldAnalyzers)
{
this.defaultAnalyzer = defaultAnalyzer;
if (fieldAnalyzers != null)
{
- System.Collections.ArrayList keys = new System.Collections.ArrayList(fieldAnalyzers.Keys);
- System.Collections.ArrayList values = new System.Collections.ArrayList(fieldAnalyzers.Values);
-
- for (int i=0; i < keys.Count; i++)
- analyzerMap[keys[i]] = values[i];
+ analyzerMap.Add(fieldAnalyzers);
}
SetOverridesTokenStreamMethod(typeof(PerFieldAnalyzerWrapper));
}
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/SloppyPhraseScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/SloppyPhraseScorer.cs?rev=1096740&r1=1096739&r2=1096740&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/SloppyPhraseScorer.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/SloppyPhraseScorer.cs Tue Apr 26 12:49:34 2011
@@ -157,7 +157,7 @@ namespace Lucene.Net.Search
{
checkedRepeats = true;
// check for repeats
- System.Collections.Hashtable m = null;
+ SupportClass.Dictionary<PhrasePositions, Object> m = null;
for (PhrasePositions pp = first; pp != null; pp = pp.next)
{
int tpPos = pp.position + pp.offset;
@@ -168,7 +168,7 @@ namespace Lucene.Net.Search
{
if (m == null)
{
- m = new System.Collections.Hashtable();
+ m = new SupportClass.Dictionary<PhrasePositions, object>();
}
pp.repeats = true;
pp2.repeats = true;
@@ -179,7 +179,8 @@ namespace Lucene.Net.Search
}
if (m != null)
{
- repeats = (PhrasePositions[])(new System.Collections.ArrayList(m.Keys).ToArray(typeof(PhrasePositions)));
+ repeats = new PhrasePositions[m.Keys.Count];
+ m.Keys.CopyTo(repeats,0);
}
}
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/SupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/SupportClass.cs?rev=1096740&r1=1096739&r2=1096740&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/SupportClass.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/SupportClass.cs Tue Apr 26 12:49:34 2011
@@ -1479,6 +1479,14 @@ public class SupportClass
}
}
+ public void Add(System.Collections.Generic.IDictionary<K, V> items)
+ {
+ foreach (K key in items.Keys)
+ {
+ _Dict.Add(key, items[key]);
+ }
+ }
+
public void Add(System.Collections.Generic.KeyValuePair<K, V> item)
{
throw new NotImplementedException();