You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/07/29 14:37:18 UTC
svn commit: r1366834 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/
lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
Author: uschindler
Date: Sun Jul 29 12:37:18 2012
New Revision: 1366834
URL: http://svn.apache.org/viewvc?rev=1366834&view=rev
Log:
Merged revision(s) 1366832 from lucene/dev/trunk:
Nicer solution to generic array creation (still problematic in Java 6, but correct in Java 7 if done this way)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java?rev=1366834&r1=1366833&r2=1366834&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java Sun Jul 29 12:37:18 2012
@@ -160,11 +160,15 @@ public class TestSubScorerFreqs extends
query.add(inner, Occur.MUST);
query.add(aQuery, Occur.MUST);
query.add(dQuery, Occur.MUST);
- @SuppressWarnings({"unchecked","rawtypes"}) Set<String>[] occurList = new Set[] {
+
+ // Only needed in Java6; Java7+ has a @SafeVarargs annotated Arrays#asList()!
+ // see http://docs.oracle.com/javase/7/docs/api/java/lang/SafeVarargs.html
+ @SuppressWarnings("unchecked") final Iterable<Set<String>> occurList = Arrays.asList(
Collections.singleton("MUST"),
new HashSet<String>(Arrays.asList("MUST", "SHOULD"))
- };
- for (Set<String> occur : occurList) {
+ );
+
+ for (final Set<String> occur : occurList) {
CountingCollector c = new CountingCollector(TopScoreDocCollector.create(
10, true), occur);
s.search(query, null, c);