Author: schor
Date: Wed Sep 21 15:38:40 2016
New Revision: 1761770
URL: http://svn.apache.org/viewvc?rev=1761770&view=rev
Log:
[UIMA-5115] change per discussion on Jira: at() means just sameBeginEnd,
between implies coveredBy, update some names, remove general bound spec -
instead it's always part of iteration style: coveredBy or covering (or
between), rename other use of at for position to startAt.
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java?rev=1761770&r1=1761769&r2=1761770&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java
Wed Sep 21 15:38:40 2016
@@ -87,18 +87,31 @@ public interface SelectFSs<T extends Fea
// SelectFSs<T> noSubtypes(boolean noSubtypes);
/*********************************
- * bounding limits
+ * bounding limits specified
+ * as part of subselection style
*********************************/
- SelectFSs<T> at(Annotation fs); // AI
- SelectFSs<T> at(int begin, int end); // AI
- SelectFSs<T> between(Annotation fs1, Annotation fs2); // AI
/*********************************
+ * starting position specification
+ *********************************/
+ SelectFSs<T> startAt(Annotation fs); // AI
+ SelectFSs<T> startAt(int begin, int end); // AI
+
+ SelectFSs<T> startAt(Annotation fs, int shift); // AI
+ SelectFSs<T> startAt(int begin, int end, int shift); // AI
+
+ /*********************************
* subselection based on bounds
*********************************/
- SelectFSs<T> sameBeginEnd(); // AI
- SelectFSs<T> covered(); // AI
- SelectFSs<T> covering(); // AI
+ SelectFSs<T> at(Annotation fs); // AI
+ SelectFSs<T> at(int begin, int end); // AI
+
+ SelectFSs<T> coveredBy(Annotation fs); // AI
+ SelectFSs<T> coveredBy(int begin, int end); // AI
+ SelectFSs<T> covering(Annotation fs); // AI
+ SelectFSs<T> covering(int begin, int end); // AI
+
+ SelectFSs<T> between(Annotation fs1, Annotation fs2); // AI implies a
coveredBy style
/*********************************
* terminal operations
@@ -118,5 +131,4 @@ public interface SelectFSs<T extends Fea
* concise forms using positional arguments
********************************************/
- // empty for now
}
