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 2014/03/13 09:35:50 UTC
svn commit: r1577063 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/util/fst/Util.java
Author: uschindler
Date: Thu Mar 13 08:35:49 2014
New Revision: 1577063
URL: http://svn.apache.org/r1577063
Log:
Merged revision(s) 1577062 from lucene/dev/trunk:
LUCENE-5519: Fix generics
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/java/org/apache/lucene/util/fst/Util.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java?rev=1577063&r1=1577062&r2=1577063&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java Thu Mar 13 08:35:49 2014
@@ -499,7 +499,7 @@ public final class Util {
T finalOutput = fst.outputs.add(path.cost, path.arc.output);
if (acceptResult(path.input, finalOutput)) {
//System.out.println(" add result: " + path);
- results.add(new Result(path.input, finalOutput));
+ results.add(new Result<>(path.input, finalOutput));
} else {
rejectCount++;
}
@@ -512,7 +512,7 @@ public final class Util {
}
}
}
- return new TopResults(rejectCount + topN <= maxQueueDepth, results);
+ return new TopResults<>(rejectCount + topN <= maxQueueDepth, results);
}
protected boolean acceptResult(IntsRef input, T output) {