https://www.mediawiki.org/wiki/Special:Code/MediaWiki/109910
Revision: 109910
Author: oren
Date: 2012-01-24 09:59:10 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
replaced Raw types with Generic types for code safety
Modified Paths:
--------------
trunk/lucene-search-3/src/main/java/org/apache/lucene/search/MultiSearcherBase.java
trunk/lucene-search-3/src/main/java/org/apache/lucene/search/PositionalScorer.java
Modified:
trunk/lucene-search-3/src/main/java/org/apache/lucene/search/MultiSearcherBase.java
===================================================================
---
trunk/lucene-search-3/src/main/java/org/apache/lucene/search/MultiSearcherBase.java
2012-01-24 09:48:26 UTC (rev 109909)
+++
trunk/lucene-search-3/src/main/java/org/apache/lucene/search/MultiSearcherBase.java
2012-01-24 09:59:10 UTC (rev 109910)
@@ -335,7 +335,7 @@
Query rewrittenQuery = rewrite(original);
// step 2
- Set terms = new HashSet();
+ Set<Object> terms = new HashSet<Object>();
rewrittenQuery.extractTerms(terms);
// step3
Modified:
trunk/lucene-search-3/src/main/java/org/apache/lucene/search/PositionalScorer.java
===================================================================
---
trunk/lucene-search-3/src/main/java/org/apache/lucene/search/PositionalScorer.java
2012-01-24 09:48:26 UTC (rev 109909)
+++
trunk/lucene-search-3/src/main/java/org/apache/lucene/search/PositionalScorer.java
2012-01-24 09:59:10 UTC (rev 109910)
@@ -530,14 +530,14 @@
if (!checkedRepeats) {
checkedRepeats = true;
// check for repeats
- HashMap m = null;
+ HashMap<PhrasePositionsBoost,Object> m = null;
for (PhrasePositionsBoost pp = first; pp !=
null; pp = pp.next) {
int tpPos = pp.position + pp.offset;
for (PhrasePositionsBoost pp2 =
pp.next; pp2 != null; pp2 = pp2.next) {
int tpPos2 = pp2.position +
pp2.offset;
if (tpPos2 == tpPos) {
if (m == null)
- m = new
HashMap();
+ m = new
HashMap<PhrasePositionsBoost,Object>();
pp.repeats = true;
pp2.repeats = true;
m.put(pp,null);
@@ -546,7 +546,7 @@
}
}
if (m!=null)
- repeats = (PhrasePositionsBoost[])
m.keySet().toArray(new PhrasePositionsBoost[0]);
+ repeats = m.keySet().toArray(new
PhrasePositionsBoost[0]);
}
// with repeats must advance some repeating pp's so
they all start with differing tp's
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
