fixes. changed attributes to interface types
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/510a43f1 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/510a43f1 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/510a43f1 Branch: refs/heads/branch_4x Commit: 510a43f13799805716197162083ada6e70d2492c Parents: fc52518 Author: James Blair <[email protected]> Authored: Tue Nov 5 13:26:44 2013 -0500 Committer: James Blair <[email protected]> Committed: Tue Nov 5 13:26:44 2013 -0500 ---------------------------------------------------------------------- .../Analyzers/AR/ArabicNormalizationFilter.cs | 4 ++-- src/contrib/Analyzers/AR/ArabicStemFilter.cs | 8 ++++---- src/contrib/Analyzers/BR/BrazilianStemFilter.cs | 8 ++++---- .../Analyzers/Charfilter/BaseCharFilter.cs | 19 ++++++++++++++++++- .../Charfilter/HTMLStripCharFilterFactory.cs | 19 ++++++++++++++++++- .../Analyzers/Charfilter/HTMLStripCharfilter.cs | 19 ++++++++++++++++++- .../Analyzers/Charfilter/MappingCharFilter.cs | 19 ++++++++++++++++++- .../Charfilter/MappingCharFilterFactory.cs | 19 ++++++++++++++++++- .../Analyzers/Charfilter/NormalizeCharMap.cs | 19 ++++++++++++++++++- src/contrib/Analyzers/Core/LowerCaseFilter.cs | 2 +- src/contrib/Analyzers/Core/StopFilter.cs | 2 +- src/contrib/Analyzers/En/EnglishAnalyzer.cs | 6 +++++- .../Analyzers/En/EnglishMinimalStemFilter.cs | 8 ++++---- .../Analyzers/En/EnglishPossessiveFilter.cs | 4 ++-- src/contrib/Analyzers/En/KStemFilter.cs | 8 ++++---- src/contrib/Analyzers/En/PorterStemFilter.cs | 8 ++++---- src/contrib/Analyzers/En/PorterStemmer.cs | 2 +- .../Miscellaneous/SetKeywordMarkerFilter.cs | 4 ++-- src/contrib/Analyzers/Standard/ClassicFilter.cs | 4 ++-- .../Analyzers/Standard/ClassicTokenizer.cs | 8 ++++---- src/contrib/Analyzers/Standard/StandardFilter.cs | 4 ++-- src/contrib/Analyzers/Util/CharArrayMap.cs | 4 ++-- 22 files changed, 152 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/AR/ArabicNormalizationFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/AR/ArabicNormalizationFilter.cs b/src/contrib/Analyzers/AR/ArabicNormalizationFilter.cs index a4a196c..c7c9530 100644 --- a/src/contrib/Analyzers/AR/ArabicNormalizationFilter.cs +++ b/src/contrib/Analyzers/AR/ArabicNormalizationFilter.cs @@ -22,11 +22,11 @@ namespace Lucene.Net.Analysis.AR public class ArabicNormalizationFilter : TokenFilter { private readonly ArabicNormalizer _normalizer = new ArabicNormalizer(); - private readonly CharTermAttribute _termAtt; + private readonly ICharTermAttribute _termAtt; public ArabicNormalizationFilter(TokenStream input) : base(input) { - _termAtt = AddAttribute<CharTermAttribute>(); + _termAtt = AddAttribute<ICharTermAttribute>(); } public override bool IncrementToken() http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/AR/ArabicStemFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/AR/ArabicStemFilter.cs b/src/contrib/Analyzers/AR/ArabicStemFilter.cs index 125ef10..25e303a 100644 --- a/src/contrib/Analyzers/AR/ArabicStemFilter.cs +++ b/src/contrib/Analyzers/AR/ArabicStemFilter.cs @@ -31,14 +31,14 @@ namespace Lucene.Net.Analysis.AR public class ArabicStemFilter : TokenFilter { private readonly ArabicStemmer _stemmer; - private readonly CharTermAttribute _termAtt; // AddAttribute<>() must be called in constructor - private readonly KeywordAttribute _keywordAtt; // because it can't be called in the member initializer + private readonly ICharTermAttribute _termAtt; // AddAttribute<>() must be called in constructor + private readonly IKeywordAttribute _keywordAtt; // because it can't be called in the member initializer public ArabicStemFilter(TokenStream input) : base(input) { _stemmer = new ArabicStemmer(); - _termAtt = AddAttribute<CharTermAttribute>(); - _keywordAtt = AddAttribute<KeywordAttribute>(); + _termAtt = AddAttribute<ICharTermAttribute>(); + _keywordAtt = AddAttribute<IKeywordAttribute>(); } public override bool IncrementToken() http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/BR/BrazilianStemFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/BR/BrazilianStemFilter.cs b/src/contrib/Analyzers/BR/BrazilianStemFilter.cs index 67ef1e2..618fb06 100644 --- a/src/contrib/Analyzers/BR/BrazilianStemFilter.cs +++ b/src/contrib/Analyzers/BR/BrazilianStemFilter.cs @@ -24,13 +24,13 @@ namespace Lucene.Net.Analysis.BR { private BrazilianStemmer _stemmer = new BrazilianStemmer(); private ISet<string> _exclusions = null; - private readonly CharTermAttribute _termAtt; - private readonly KeywordAttribute _keywordAtt; + private readonly ICharTermAttribute _termAtt; + private readonly IKeywordAttribute _keywordAtt; public BrazilianStemFilter(TokenStream input) : base(input) { - _termAtt = AddAttribute<CharTermAttribute>(); - _keywordAtt = AddAttribute<KeywordAttribute>(); + _termAtt = AddAttribute<ICharTermAttribute>(); + _keywordAtt = AddAttribute<IKeywordAttribute>(); } public override bool IncrementToken() http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Charfilter/BaseCharFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Charfilter/BaseCharFilter.cs b/src/contrib/Analyzers/Charfilter/BaseCharFilter.cs index 24c9550..8ec2cff 100644 --- a/src/contrib/Analyzers/Charfilter/BaseCharFilter.cs +++ b/src/contrib/Analyzers/Charfilter/BaseCharFilter.cs @@ -1,4 +1,21 @@ -using System.Diagnostics; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System.Diagnostics; using System.IO; using Lucene.Net.Support; using Lucene.Net.Util; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Charfilter/HTMLStripCharFilterFactory.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Charfilter/HTMLStripCharFilterFactory.cs b/src/contrib/Analyzers/Charfilter/HTMLStripCharFilterFactory.cs index ff4b2d1..55f249f 100644 --- a/src/contrib/Analyzers/Charfilter/HTMLStripCharFilterFactory.cs +++ b/src/contrib/Analyzers/Charfilter/HTMLStripCharFilterFactory.cs @@ -1,4 +1,21 @@ -using System; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; using System.Collections.Generic; using System.IO; using System.Linq; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Charfilter/HTMLStripCharfilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Charfilter/HTMLStripCharfilter.cs b/src/contrib/Analyzers/Charfilter/HTMLStripCharfilter.cs index 8796e71..111ab09 100644 --- a/src/contrib/Analyzers/Charfilter/HTMLStripCharfilter.cs +++ b/src/contrib/Analyzers/Charfilter/HTMLStripCharfilter.cs @@ -1,4 +1,21 @@ -using System; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; using System.Collections.Generic; using System.Globalization; using System.IO; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Charfilter/MappingCharFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Charfilter/MappingCharFilter.cs b/src/contrib/Analyzers/Charfilter/MappingCharFilter.cs index a870d8c..19aed96 100644 --- a/src/contrib/Analyzers/Charfilter/MappingCharFilter.cs +++ b/src/contrib/Analyzers/Charfilter/MappingCharFilter.cs @@ -1,4 +1,21 @@ -using System.Collections.Generic; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System.Collections.Generic; using System.Diagnostics; using System.IO; using Lucene.Net.Analysis.Support; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Charfilter/MappingCharFilterFactory.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Charfilter/MappingCharFilterFactory.cs b/src/contrib/Analyzers/Charfilter/MappingCharFilterFactory.cs index 25e6bbc..173ded3 100644 --- a/src/contrib/Analyzers/Charfilter/MappingCharFilterFactory.cs +++ b/src/contrib/Analyzers/Charfilter/MappingCharFilterFactory.cs @@ -1,4 +1,21 @@ -using System; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; using System.Collections.Generic; using System.Globalization; using System.IO; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Charfilter/NormalizeCharMap.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Charfilter/NormalizeCharMap.cs b/src/contrib/Analyzers/Charfilter/NormalizeCharMap.cs index 22facfd..023f831 100644 --- a/src/contrib/Analyzers/Charfilter/NormalizeCharMap.cs +++ b/src/contrib/Analyzers/Charfilter/NormalizeCharMap.cs @@ -1,4 +1,21 @@ -using System; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Core/LowerCaseFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Core/LowerCaseFilter.cs b/src/contrib/Analyzers/Core/LowerCaseFilter.cs index d0157f5..d065be1 100644 --- a/src/contrib/Analyzers/Core/LowerCaseFilter.cs +++ b/src/contrib/Analyzers/Core/LowerCaseFilter.cs @@ -11,7 +11,7 @@ namespace Lucene.Net.Analysis.Core public sealed class LowerCaseFilter : TokenFilter { private readonly CharacterUtils charUtils; - private readonly ICharTermAttribute termAtt; // = addAttribute(CharTermAttribute.class); + private readonly ICharTermAttribute termAtt; public LowerCaseFilter(Version? matchVersion, TokenStream input) : base(input) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Core/StopFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Core/StopFilter.cs b/src/contrib/Analyzers/Core/StopFilter.cs index c9a193b..5ebb4be 100644 --- a/src/contrib/Analyzers/Core/StopFilter.cs +++ b/src/contrib/Analyzers/Core/StopFilter.cs @@ -12,7 +12,7 @@ namespace Lucene.Net.Analysis.Core public sealed class StopFilter : FilteringTokenFilter { private readonly CharArraySet stopWords; - private readonly ICharTermAttribute termAtt; // = addAttribute(CharTermAttribute.class); + private readonly ICharTermAttribute termAtt; public StopFilter(Version? matchVersion, TokenStream input, CharArraySet stopWords) : base(true, input) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/En/EnglishAnalyzer.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/En/EnglishAnalyzer.cs b/src/contrib/Analyzers/En/EnglishAnalyzer.cs index 6a9f92d..965a34e 100644 --- a/src/contrib/Analyzers/En/EnglishAnalyzer.cs +++ b/src/contrib/Analyzers/En/EnglishAnalyzer.cs @@ -63,7 +63,11 @@ namespace Lucene.Net.Analysis.En } result = new LowerCaseFilter(matchVersion.Value, result); result = new StopFilter(matchVersion.Value, result, stopwords); - if (stemExclusionSet.Any()) + //if (stemExclusionSet.Any()) + //{ + // result = new SetKeywordMarkerFilter(result, stemExclusionSet); + //} + if (stemExclusionSet.Count > 0) { result = new SetKeywordMarkerFilter(result, stemExclusionSet); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/En/EnglishMinimalStemFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/En/EnglishMinimalStemFilter.cs b/src/contrib/Analyzers/En/EnglishMinimalStemFilter.cs index 65f2fb9..5048fb2 100644 --- a/src/contrib/Analyzers/En/EnglishMinimalStemFilter.cs +++ b/src/contrib/Analyzers/En/EnglishMinimalStemFilter.cs @@ -22,14 +22,14 @@ namespace Lucene.Net.Analysis.En public class EnglishMinimalStemFilter : TokenFilter { private readonly EnglishMinimalStemmer stemmer = new EnglishMinimalStemmer(); - private readonly CharTermAttribute termAtt; - private readonly KeywordAttribute keywordAtt; + private readonly ICharTermAttribute termAtt; + private readonly IKeywordAttribute keywordAtt; public EnglishMinimalStemFilter(TokenStream input) : base(input) { - termAtt = AddAttribute<CharTermAttribute>(); - keywordAtt = AddAttribute<KeywordAttribute>(); + termAtt = AddAttribute<ICharTermAttribute>(); + keywordAtt = AddAttribute<IKeywordAttribute>(); } public override bool IncrementToken() http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/En/EnglishPossessiveFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/En/EnglishPossessiveFilter.cs b/src/contrib/Analyzers/En/EnglishPossessiveFilter.cs index 9abfa9c..9216a21 100644 --- a/src/contrib/Analyzers/En/EnglishPossessiveFilter.cs +++ b/src/contrib/Analyzers/En/EnglishPossessiveFilter.cs @@ -24,7 +24,7 @@ namespace Lucene.Net.Analysis.En { public sealed class EnglishPossessiveFilter : TokenFilter { - private readonly CharTermAttribute termAtt; + private readonly ICharTermAttribute termAtt; private Version matchVersion; [Obsolete] @@ -34,7 +34,7 @@ namespace Lucene.Net.Analysis.En :base (input) { this.matchVersion = version; - termAtt = AddAttribute<CharTermAttribute>(); + termAtt = AddAttribute<ICharTermAttribute>(); } public override bool IncrementToken() http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/En/KStemFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/En/KStemFilter.cs b/src/contrib/Analyzers/En/KStemFilter.cs index aefff53..3af9c8b 100644 --- a/src/contrib/Analyzers/En/KStemFilter.cs +++ b/src/contrib/Analyzers/En/KStemFilter.cs @@ -22,14 +22,14 @@ namespace Lucene.Net.Analysis.En public class KStemFilter : TokenFilter { private readonly KStemmer stemmer = new KStemmer(); - private readonly CharTermAttribute termAttribute; - private readonly KeywordAttribute keywordAtt; + private readonly ICharTermAttribute termAttribute; + private readonly IKeywordAttribute keywordAtt; public KStemFilter(TokenStream input) : base(input) { - termAttribute = AddAttribute<CharTermAttribute>(); - keywordAtt = AddAttribute<KeywordAttribute>(); + termAttribute = AddAttribute<ICharTermAttribute>(); + keywordAtt = AddAttribute<IKeywordAttribute>(); } public override bool IncrementToken() http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/En/PorterStemFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/En/PorterStemFilter.cs b/src/contrib/Analyzers/En/PorterStemFilter.cs index 1f13cf5..ee16557 100644 --- a/src/contrib/Analyzers/En/PorterStemFilter.cs +++ b/src/contrib/Analyzers/En/PorterStemFilter.cs @@ -52,13 +52,13 @@ namespace Lucene.Net.Analysis.En public class PorterStemFilter : TokenFilter { private readonly PorterStemmer stemmer = new PorterStemmer(); - private readonly CharTermAttribute termAtt; - private readonly KeywordAttribute keyAtt; + private readonly ICharTermAttribute termAtt; + private readonly IKeywordAttribute keyAtt; public PorterStemFilter(TokenStream input) : base(input) { - termAtt = AddAttribute<CharTermAttribute>(); - keyAtt = AddAttribute<KeywordAttribute>(); + termAtt = AddAttribute<ICharTermAttribute>(); + keyAtt = AddAttribute<IKeywordAttribute>(); } public sealed override bool IncrementToken() http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/En/PorterStemmer.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/En/PorterStemmer.cs b/src/contrib/Analyzers/En/PorterStemmer.cs index 80e3db3..5332ac1 100644 --- a/src/contrib/Analyzers/En/PorterStemmer.cs +++ b/src/contrib/Analyzers/En/PorterStemmer.cs @@ -516,7 +516,7 @@ namespace Lucene.Net.Analysis.En public bool Stem(char[] wordBuffer, int offset, int wordLen) { Reset(); - if (b.Length > wordLen) + if (b.Length < wordLen) { b = new char[ArrayUtil.Oversize(wordLen, RamUsageEstimator.NUM_BYTES_CHAR)]; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Miscellaneous/SetKeywordMarkerFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Miscellaneous/SetKeywordMarkerFilter.cs b/src/contrib/Analyzers/Miscellaneous/SetKeywordMarkerFilter.cs index f3f8200..947029f 100644 --- a/src/contrib/Analyzers/Miscellaneous/SetKeywordMarkerFilter.cs +++ b/src/contrib/Analyzers/Miscellaneous/SetKeywordMarkerFilter.cs @@ -22,14 +22,14 @@ namespace Lucene.Net.Analysis.Miscellaneous { public sealed class SetKeywordMarkerFilter : KeywordMarkerFilter { - private readonly CharTermAttribute termAtt; + private readonly ICharTermAttribute termAtt; private readonly CharArraySet keywordSet; public SetKeywordMarkerFilter(TokenStream input, CharArraySet keywordSet) :base(input) { this.keywordSet = keywordSet; - termAtt = AddAttribute<CharTermAttribute>(); + termAtt = AddAttribute<ICharTermAttribute>(); } protected override bool IsKeyword() http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Standard/ClassicFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Standard/ClassicFilter.cs b/src/contrib/Analyzers/Standard/ClassicFilter.cs index eac2d3e..fd77c6e 100644 --- a/src/contrib/Analyzers/Standard/ClassicFilter.cs +++ b/src/contrib/Analyzers/Standard/ClassicFilter.cs @@ -19,8 +19,8 @@ namespace Lucene.Net.Analysis.Standard private static readonly String ACRONYM_TYPE = ClassicTokenizer.TOKEN_TYPES[ClassicTokenizer.ACRONYM]; // this filters uses attribute type - private readonly ITypeAttribute typeAtt; // = addAttribute(TypeAttribute.class); - private readonly ICharTermAttribute termAtt; // = addAttribute(CharTermAttribute.class); + private readonly ITypeAttribute typeAtt; + private readonly ICharTermAttribute termAtt; public override bool IncrementToken() { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Standard/ClassicTokenizer.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Standard/ClassicTokenizer.cs b/src/contrib/Analyzers/Standard/ClassicTokenizer.cs index bad1c9e..ea0c45e 100644 --- a/src/contrib/Analyzers/Standard/ClassicTokenizer.cs +++ b/src/contrib/Analyzers/Standard/ClassicTokenizer.cs @@ -72,10 +72,10 @@ namespace Lucene.Net.Analysis.Standard // this tokenizer generates three attributes: // term offset, positionIncrement and type - private readonly ICharTermAttribute termAtt; // = addAttribute(CharTermAttribute.class); - private readonly IOffsetAttribute offsetAtt; // = addAttribute(OffsetAttribute.class); - private readonly IPositionIncrementAttribute posIncrAtt; // = addAttribute(PositionIncrementAttribute.class); - private readonly ITypeAttribute typeAtt; // = addAttribute(TypeAttribute.class); + private readonly ICharTermAttribute termAtt; + private readonly IOffsetAttribute offsetAtt; + private readonly IPositionIncrementAttribute posIncrAtt; + private readonly ITypeAttribute typeAtt; public override bool IncrementToken() { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Standard/StandardFilter.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Standard/StandardFilter.cs b/src/contrib/Analyzers/Standard/StandardFilter.cs index 9381883..6de2f09 100644 --- a/src/contrib/Analyzers/Standard/StandardFilter.cs +++ b/src/contrib/Analyzers/Standard/StandardFilter.cs @@ -25,8 +25,8 @@ namespace Lucene.Net.Analysis.Standard private static readonly String ACRONYM_TYPE = ClassicTokenizer.TOKEN_TYPES[ClassicTokenizer.ACRONYM]; // this filters uses attribute type - private readonly ITypeAttribute typeAtt; // = addAttribute(TypeAttribute.class); - private readonly ICharTermAttribute termAtt; // = addAttribute(CharTermAttribute.class); + private readonly ITypeAttribute typeAtt; + private readonly ICharTermAttribute termAtt; public override bool IncrementToken() { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/510a43f1/src/contrib/Analyzers/Util/CharArrayMap.cs ---------------------------------------------------------------------- diff --git a/src/contrib/Analyzers/Util/CharArrayMap.cs b/src/contrib/Analyzers/Util/CharArrayMap.cs index fb7ee13..d2dce82 100644 --- a/src/contrib/Analyzers/Util/CharArrayMap.cs +++ b/src/contrib/Analyzers/Util/CharArrayMap.cs @@ -714,9 +714,9 @@ namespace Lucene.Net.Analysis.Util throw new NotSupportedException(); } - internal override CharArrayMap<V>.EntrySet CreateEntrySet() + internal override EntrySet CreateEntrySet() { - throw new NotSupportedException(); + return new EntrySet(this, false); } }
