LUCENE-3850: Removed some of the rawtypes compiler warnings

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1298297 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Martijn van Groningen 2012-03-08 08:40:58 +00:00
parent a42943db90
commit 4a47b25976
4 changed files with 8 additions and 8 deletions

View File

@ -41,7 +41,7 @@ import java.util.Map;
public class FunctionAllGroupHeadsCollector extends AbstractAllGroupHeadsCollector<FunctionAllGroupHeadsCollector.GroupHead> { public class FunctionAllGroupHeadsCollector extends AbstractAllGroupHeadsCollector<FunctionAllGroupHeadsCollector.GroupHead> {
private final ValueSource groupBy; private final ValueSource groupBy;
private final Map vsContext; private final Map<?, ?> vsContext;
private final Map<MutableValue, GroupHead> groups; private final Map<MutableValue, GroupHead> groups;
private final Sort sortWithinGroup; private final Sort sortWithinGroup;
@ -57,7 +57,7 @@ public class FunctionAllGroupHeadsCollector extends AbstractAllGroupHeadsCollect
* @param vsContext The ValueSource context * @param vsContext The ValueSource context
* @param sortWithinGroup The sort within a group * @param sortWithinGroup The sort within a group
*/ */
public FunctionAllGroupHeadsCollector(ValueSource groupBy, Map vsContext, Sort sortWithinGroup) { public FunctionAllGroupHeadsCollector(ValueSource groupBy, Map<?, ?> vsContext, Sort sortWithinGroup) {
super(sortWithinGroup.getSort().length); super(sortWithinGroup.getSort().length);
groups = new HashMap<MutableValue, GroupHead>(); groups = new HashMap<MutableValue, GroupHead>();
this.sortWithinGroup = sortWithinGroup; this.sortWithinGroup = sortWithinGroup;

View File

@ -43,7 +43,7 @@ import java.util.TreeSet;
*/ */
public class FunctionAllGroupsCollector extends AbstractAllGroupsCollector<MutableValue> { public class FunctionAllGroupsCollector extends AbstractAllGroupsCollector<MutableValue> {
private final Map vsContext; private final Map<?, ?> vsContext;
private final ValueSource groupBy; private final ValueSource groupBy;
private final SortedSet<MutableValue> groups = new TreeSet<MutableValue>(); private final SortedSet<MutableValue> groups = new TreeSet<MutableValue>();
@ -56,7 +56,7 @@ public class FunctionAllGroupsCollector extends AbstractAllGroupsCollector<Mutab
* @param groupBy The {@link ValueSource} to group by * @param groupBy The {@link ValueSource} to group by
* @param vsContext The ValueSource context * @param vsContext The ValueSource context
*/ */
public FunctionAllGroupsCollector(ValueSource groupBy, Map vsContext) { public FunctionAllGroupsCollector(ValueSource groupBy, Map<?, ?> vsContext) {
this.vsContext = vsContext; this.vsContext = vsContext;
this.groupBy = groupBy; this.groupBy = groupBy;
} }

View File

@ -36,7 +36,7 @@ import java.util.Map;
public class FunctionFirstPassGroupingCollector extends AbstractFirstPassGroupingCollector<MutableValue> { public class FunctionFirstPassGroupingCollector extends AbstractFirstPassGroupingCollector<MutableValue> {
private final ValueSource groupByVS; private final ValueSource groupByVS;
private final Map vsContext; private final Map<?, ?> vsContext;
private FunctionValues docValues; private FunctionValues docValues;
private FunctionValues.ValueFiller filler; private FunctionValues.ValueFiller filler;
@ -56,7 +56,7 @@ public class FunctionFirstPassGroupingCollector extends AbstractFirstPassGroupin
* @param topNGroups How many top groups to keep. * @param topNGroups How many top groups to keep.
* @throws IOException When I/O related errors occur * @throws IOException When I/O related errors occur
*/ */
public FunctionFirstPassGroupingCollector(ValueSource groupByVS, Map vsContext, Sort groupSort, int topNGroups) throws IOException { public FunctionFirstPassGroupingCollector(ValueSource groupByVS, Map<?, ?> vsContext, Sort groupSort, int topNGroups) throws IOException {
super(groupSort, topNGroups); super(groupSort, topNGroups);
this.groupByVS = groupByVS; this.groupByVS = groupByVS;
this.vsContext = vsContext; this.vsContext = vsContext;

View File

@ -39,7 +39,7 @@ import java.util.Map;
public class FunctionSecondPassGroupingCollector extends AbstractSecondPassGroupingCollector<MutableValue> { public class FunctionSecondPassGroupingCollector extends AbstractSecondPassGroupingCollector<MutableValue> {
private final ValueSource groupByVS; private final ValueSource groupByVS;
private final Map vsContext; private final Map<?, ?> vsContext;
private FunctionValues.ValueFiller filler; private FunctionValues.ValueFiller filler;
private MutableValue mval; private MutableValue mval;
@ -58,7 +58,7 @@ public class FunctionSecondPassGroupingCollector extends AbstractSecondPassGroup
* @param vsContext The value source context * @param vsContext The value source context
* @throws IOException IOException When I/O related errors occur * @throws IOException IOException When I/O related errors occur
*/ */
public FunctionSecondPassGroupingCollector(Collection<SearchGroup<MutableValue>> searchGroups, Sort groupSort, Sort withinGroupSort, int maxDocsPerGroup, boolean getScores, boolean getMaxScores, boolean fillSortFields, ValueSource groupByVS, Map vsContext) throws IOException { public FunctionSecondPassGroupingCollector(Collection<SearchGroup<MutableValue>> searchGroups, Sort groupSort, Sort withinGroupSort, int maxDocsPerGroup, boolean getScores, boolean getMaxScores, boolean fillSortFields, ValueSource groupByVS, Map<?, ?> vsContext) throws IOException {
super(searchGroups, groupSort, withinGroupSort, maxDocsPerGroup, getScores, getMaxScores, fillSortFields); super(searchGroups, groupSort, withinGroupSort, maxDocsPerGroup, getScores, getMaxScores, fillSortFields);
this.groupByVS = groupByVS; this.groupByVS = groupByVS;
this.vsContext = vsContext; this.vsContext = vsContext;