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/08/21 18:49:28 UTC
svn commit: r1375659 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/common-build.xml lucene/core/
lucene/core/src/java/org/apache/lucene/index/CoalescedDeletes.java
Author: uschindler
Date: Tue Aug 21 16:49:28 2012
New Revision: 1375659
URL: http://svn.apache.org/viewvc?rev=1375659&view=rev
Log:
Merged revision(s) 1375657 from lucene/dev/trunk:
Silence Java 7 warnings
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CoalescedDeletes.java
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1375659&r1=1375658&r2=1375659&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Tue Aug 21 16:49:28 2012
@@ -135,7 +135,7 @@
<property name="javac.target" value="1.6"/>
<property name="javac.source.backwards" value="1.6"/>
<property name="javac.target.backwards" value="1.6"/>
- <property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial"/>
+ <property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial -Xlint:-options"/>
<property name="bootclasspath" value=""/>
<property name="javadoc.link" value="http://download.oracle.com/javase/6/docs/api/"/>
<property name="javadoc.link.junit" value="http://junit.sourceforge.net/javadoc/"/>
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CoalescedDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CoalescedDeletes.java?rev=1375659&r1=1375658&r2=1375659&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CoalescedDeletes.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CoalescedDeletes.java Tue Aug 21 16:49:28 2012
@@ -47,7 +47,7 @@ class CoalescedDeletes {
public Iterable<Term> termsIterable() {
return new Iterable<Term>() {
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked","rawtypes"})
@Override
public Iterator<Term> iterator() {
Iterator<Term> subs[] = new Iterator[iterables.size()];