From 4a47b2597617c89865c3b3fc1b47dfe4498e83a0 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Thu, 8 Mar 2012 08:40:58 +0000 Subject: [PATCH] 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 --- .../grouping/function/FunctionAllGroupHeadsCollector.java | 4 ++-- .../search/grouping/function/FunctionAllGroupsCollector.java | 4 ++-- .../grouping/function/FunctionFirstPassGroupingCollector.java | 4 ++-- .../function/FunctionSecondPassGroupingCollector.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java b/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java index d07ec6bd421..ad94354e4d7 100644 --- a/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java +++ b/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java @@ -41,7 +41,7 @@ import java.util.Map; public class FunctionAllGroupHeadsCollector extends AbstractAllGroupHeadsCollector { private final ValueSource groupBy; - private final Map vsContext; + private final Map vsContext; private final Map groups; private final Sort sortWithinGroup; @@ -57,7 +57,7 @@ public class FunctionAllGroupHeadsCollector extends AbstractAllGroupHeadsCollect * @param vsContext The ValueSource context * @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); groups = new HashMap(); this.sortWithinGroup = sortWithinGroup; diff --git a/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java b/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java index b947b23a9e7..cbfda8e9aac 100644 --- a/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java +++ b/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java @@ -43,7 +43,7 @@ import java.util.TreeSet; */ public class FunctionAllGroupsCollector extends AbstractAllGroupsCollector { - private final Map vsContext; + private final Map vsContext; private final ValueSource groupBy; private final SortedSet groups = new TreeSet(); @@ -56,7 +56,7 @@ public class FunctionAllGroupsCollector extends AbstractAllGroupsCollector vsContext) { this.vsContext = vsContext; this.groupBy = groupBy; } diff --git a/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java b/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java index 6c078f9c38a..f80c6ea7ed3 100644 --- a/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java +++ b/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java @@ -36,7 +36,7 @@ import java.util.Map; public class FunctionFirstPassGroupingCollector extends AbstractFirstPassGroupingCollector { private final ValueSource groupByVS; - private final Map vsContext; + private final Map vsContext; private FunctionValues docValues; private FunctionValues.ValueFiller filler; @@ -56,7 +56,7 @@ public class FunctionFirstPassGroupingCollector extends AbstractFirstPassGroupin * @param topNGroups How many top groups to keep. * @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); this.groupByVS = groupByVS; this.vsContext = vsContext; diff --git a/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java b/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java index 0dd466167a4..5c11df1b213 100644 --- a/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java +++ b/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java @@ -39,7 +39,7 @@ import java.util.Map; public class FunctionSecondPassGroupingCollector extends AbstractSecondPassGroupingCollector { private final ValueSource groupByVS; - private final Map vsContext; + private final Map vsContext; private FunctionValues.ValueFiller filler; private MutableValue mval; @@ -58,7 +58,7 @@ public class FunctionSecondPassGroupingCollector extends AbstractSecondPassGroup * @param vsContext The value source context * @throws IOException IOException When I/O related errors occur */ - public FunctionSecondPassGroupingCollector(Collection> searchGroups, Sort groupSort, Sort withinGroupSort, int maxDocsPerGroup, boolean getScores, boolean getMaxScores, boolean fillSortFields, ValueSource groupByVS, Map vsContext) throws IOException { + public FunctionSecondPassGroupingCollector(Collection> 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); this.groupByVS = groupByVS; this.vsContext = vsContext;