https://www.mediawiki.org/wiki/Special:Code/MediaWiki/109796
Revision: 109796
Author: oren
Date: 2012-01-23 02:03:45 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
added generic arguments to a collection to make class more type safe
Modified Paths:
--------------
trunk/lucene-search-3/src/main/java/org/apache/lucene/search/MultiSearcherBase.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-23 02:02:42 UTC (rev 109795)
+++
trunk/lucene-search-3/src/main/java/org/apache/lucene/search/MultiSearcherBase.java
2012-01-23 02:03:45 UTC (rev 109796)
@@ -40,10 +40,10 @@
* the methods necessary to initialize Weights.
*/
protected static class CachedDfSource extends Searcher {
- private Map dfMap; // Map from Terms to corresponding doc freqs
+ private Map<Term, Integer> dfMap; // Map from Terms to corresponding doc
freqs
private int maxDoc; // document count
- public CachedDfSource(Map dfMap, int maxDoc, Similarity similarity) {
+ public CachedDfSource(Map<Term, Integer> dfMap, int maxDoc, Similarity
similarity) {
this.dfMap = dfMap;
this.maxDoc = maxDoc;
setSimilarity(similarity);
@@ -52,7 +52,7 @@
public int docFreq(Term term) {
int df;
try {
- df = ((Integer) dfMap.get(term)).intValue();
+ df = dfMap.get(term).intValue();
} catch (NullPointerException e) {
throw new IllegalArgumentException("df for term " + term.text()
+ " not available");
@@ -349,7 +349,7 @@
}
}
- HashMap dfMap = new HashMap();
+ HashMap<Term, Integer> dfMap = new HashMap<Term, Integer>();
for(int i=0; i<allTermsArray.length; i++) {
dfMap.put(allTermsArray[i], new Integer(aggregatedDfs[i]));
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
