You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2009/05/14 18:11:28 UTC
svn commit: r774835 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima:
analysis_engine/asb/ASB.java cas/FSIndex.java cas/FSIterator.java
cas/Feature.java cas/impl/FSIteratorImplBase.java cas/impl/FeatureImpl.java
jcas/JCas.java
Author: joern
Date: Thu May 14 16:11:27 2009
New Revision: 774835
URL: http://svn.apache.org/viewvc?rev=774835&view=rev
Log:
UIMA-1341
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java?rev=774835&r1=774834&r2=774835&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java Thu May 14 16:11:27 2009
@@ -32,6 +32,7 @@
import org.apache.uima.cas.CAS;
import org.apache.uima.resource.Resource;
import org.apache.uima.resource.ResourceInitializationException;
+import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.resource.metadata.ProcessingResourceMetaData;
/**
@@ -77,7 +78,7 @@
* CasObjectProcessor instance for one of the specifiers in
* <code>aComponentSpecifiers</code>.
*/
- public void setup(Map aComponentSpecifiers, UimaContextAdmin aParentContext,
+ public void setup(Map<String, ResourceSpecifier> aComponentSpecifiers, UimaContextAdmin aParentContext,
FlowControllerDeclaration aFlowControllerDeclaration,
AnalysisEngineMetaData aAggregateMetadata) throws ResourceInitializationException;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java?rev=774835&r1=774834&r2=774835&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java Thu May 14 16:11:27 2009
@@ -53,7 +53,7 @@
*
*
*/
-public interface FSIndex {
+public interface FSIndex extends Iterable<FeatureStructure> {
/**
* Indexing strategy: sorted index. A sorted index contains all elements, including duplicates.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java?rev=774835&r1=774834&r2=774835&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java Thu May 14 16:11:27 2009
@@ -64,7 +64,7 @@
*
*
*/
-public interface FSIterator extends Iterator {
+public interface FSIterator extends Iterator<FeatureStructure> {
/**
* Check if this iterator is valid.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java?rev=774835&r1=774834&r2=774835&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java Thu May 14 16:11:27 2009
@@ -31,7 +31,7 @@
*
*
*/
-public interface Feature extends Comparable {
+public interface Feature extends Comparable<Feature> {
/**
* Get the domain type for this feature.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorImplBase.java?rev=774835&r1=774834&r2=774835&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorImplBase.java Thu May 14 16:11:27 2009
@@ -20,6 +20,7 @@
package org.apache.uima.cas.impl;
import org.apache.uima.cas.FSIterator;
+import org.apache.uima.cas.FeatureStructure;
/**
* Base class for FSIterator implementations. Defines the hasNext, next, and remove methods required
@@ -43,8 +44,8 @@
*
* @see java.util.Iterator#next()
*/
- public Object next() {
- Object result = get();
+ public FeatureStructure next() {
+ FeatureStructure result = get();
moveToNext();
return result;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java?rev=774835&r1=774834&r2=774835&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java Thu May 14 16:11:27 2009
@@ -102,7 +102,7 @@
* Note: you can only compare features from the same type system. If you compare features from
* different type systems, the result is undefined.
*/
- public int compareTo(Object o) {
+ public int compareTo(Feature o) {
if (this == o) {
return 0;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java?rev=774835&r1=774834&r2=774835&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java Thu May 14 16:11:27 2009
@@ -372,7 +372,7 @@
* The <code>FSListIterator</code> to be wrapped.
* @return An equivalent <code>ListIterator</code>.
*/
- java.util.ListIterator fs2listIterator(FSIterator it);
+ java.util.ListIterator<FeatureStructure> fs2listIterator(FSIterator it);
/**
* Reset the CAS, emptying it of all content. Feature structures and iterators will no longer be
@@ -583,7 +583,7 @@
* @return an iterator which returns all views. Each object returned by
* the iterator is of type JCas.
*/
- Iterator getViewIterator() throws CASException;
+ Iterator<CAS> getViewIterator() throws CASException;
/**
* Get iterator over all views with the given name prefix. Each view provides access to Sofa data
@@ -600,5 +600,5 @@
* @return an iterator which returns all views with the given name prefix.
* Each object returned by the iterator is of type JCas.
*/
- Iterator getViewIterator(String localViewNamePrefix) throws CASException;
+ Iterator<CAS> getViewIterator(String localViewNamePrefix) throws CASException;
}
\ No newline at end of file