svn commit: r1806952 - in /uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas: SelectFSs.java impl/FsIndex_singletype.java

[sc...@apache.org]

Author: schor
Date: Fri Sep  1 12:50:23 2017
New Revision: 1806952

URL: http://svn.apache.org/viewvc?rev=1806952&view=rev
Log:
no Jira, correct 2 compile errors due to ambiguous method inheritance, not caught by Eclipse, but complained about by Jenkins.

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java?rev=1806952&r1=1806951&r2=1806952&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java Fri Sep  1 12:50:23 2017
@@ -21,6 +21,7 @@ package org.apache.uima.cas;
 
 import java.util.List;
 import java.util.Spliterator;
+import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 import org.apache.uima.cas.text.AnnotationFS;
@@ -675,6 +676,16 @@ public interface SelectFSs<T extends Fea
     return index.select();    
   } 
   
+  /**
+   * This method is required, because the 2 interfaces inherited both define this
+   * and this is needed to disambiguate
+   * Otherwise, get a compile error (but not on Eclipse...)
+   */
+  @Override
+  default void forEach(Consumer<? super T> action) {
+    Iterable.super.forEach(action);
+  }
+
 //  /**
 //   * DON'T USE THIS, use index.select(XXX.class) instead
 //   * @param index the index to use

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java?rev=1806952&r1=1806951&r2=1806952&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java Fri Sep  1 12:50:23 2017
@@ -569,6 +569,18 @@ public abstract class FsIndex_singletype
     // casImpl.indexRepository.isUsedChanged = true;
   }
 
+  /* (non-Javadoc)
+   * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+   */
+  /**
+   * This is required to avoid compilation error (but not in Eclipse) due to 
+   * ambiguous interface inheritance from both FeatureStructure and Comparator
+   */
+  @Override
+  public abstract int compare(FeatureStructure o1, FeatureStructure o2);
+  
+  
+
   /// **
   // * Common part of iterator creation
   // */