You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2013/04/26 22:34:32 UTC
svn commit: r1476394 - in /uima/sandbox/uimafit/trunk:
uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/
uimafit/src/main/java/org/apache/uima/fit/util/
uimafit/src/test/java/org/apache/uima/fit/util/
Author: rec
Date: Fri Apr 26 20:34:32 2013
New Revision: 1476394
URL: http://svn.apache.org/r1476394
Log:
[UIMA-2803] createFSArray should return FSArray instead of ArrayFS
Modified:
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java?rev=1476394&r1=1476393&r2=1476394&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java Fri Apr 26 20:34:32 2013
@@ -24,6 +24,7 @@ package org.apache.uima.fit.util;
import static java.util.Arrays.asList;
import static org.apache.commons.lang.ArrayUtils.toObject;
import static org.apache.uima.fit.util.FSCollectionFactory.create;
+import static org.apache.uima.fit.util.FSCollectionFactory.createArrayFS;
import static org.apache.uima.fit.util.FSCollectionFactory.createBooleanArray;
import static org.apache.uima.fit.util.FSCollectionFactory.createByteArray;
import static org.apache.uima.fit.util.FSCollectionFactory.createDoubleArray;
@@ -85,15 +86,15 @@ public class FSCollectionFactoryTest {
@Test
public void testCreateFSArray() throws Exception {
- assertEquals(tokenFSs, create(createFSArray(jcas.getCas(), tokenFSs)));
+ assertEquals(tokenFSs, create(createArrayFS(jcas.getCas(), tokenFSs)));
assertEquals(
tokenFSs,
- create(createFSArray(jcas.getCas(),
+ create(createArrayFS(jcas.getCas(),
tokenFSs.toArray(new FeatureStructure[tokenFSs.size()]))));
- assertEquals(tokens, create(createFSArray(jcas.getCas(), tokens)));
+ assertEquals(tokens, create(createArrayFS(jcas.getCas(), tokens)));
assertEquals(tokens, create(createFSArray(jcas, tokens)));
assertEquals(tokens,
- create(createFSArray(jcas.getCas(), tokens.toArray(new Annotation[tokens.size()]))));
+ create(createArrayFS(jcas.getCas(), tokens.toArray(new Annotation[tokens.size()]))));
assertEquals(tokens, create(createFSArray(jcas, tokens.toArray(new Annotation[tokens.size()]))));
assertEquals(tokens,
create(createFSArray(jcas, tokens.toArray(new Annotation[tokens.size()])), Token.class));
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java?rev=1476394&r1=1476393&r2=1476394&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java Fri Apr 26 20:34:32 2013
@@ -144,19 +144,19 @@ public abstract class FSCollectionFactor
return asList(data.toArray(new FeatureStructure[data.size()]));
}
- public static ArrayFS createFSArray(CAS aCas, Collection<? extends FeatureStructure> aCollection) {
+ public static ArrayFS createArrayFS(CAS aCas, Collection<? extends FeatureStructure> aCollection) {
return fillArrayFS(aCas.createArrayFS(aCollection.size()), aCollection);
}
- public static ArrayFS createFSArray(CAS aCas, FeatureStructure[] aArray) {
+ public static ArrayFS createArrayFS(CAS aCas, FeatureStructure[] aArray) {
return fillArrayFS(aCas.createArrayFS(aArray.length), asList(aArray));
}
- public static ArrayFS createFSArray(JCas aJCas, Collection<? extends FeatureStructure> aCollection) {
+ public static FSArray createFSArray(JCas aJCas, Collection<? extends FeatureStructure> aCollection) {
return fillArrayFS(new FSArray(aJCas, aCollection.size()), aCollection);
}
- public static ArrayFS createFSArray(JCas aJCas, FeatureStructure[] aArray) {
+ public static FSArray createFSArray(JCas aJCas, FeatureStructure[] aArray) {
return fillArrayFS(new FSArray(aJCas, aArray.length), asList(aArray));
}
@@ -288,7 +288,7 @@ public abstract class FSCollectionFactor
return fillArrayFS(new StringArray(aJCas, aArray.length), aArray);
}
- public static ArrayFS fillArrayFS(ArrayFS aArrayFs,
+ public static <T extends ArrayFS> T fillArrayFS(T aArrayFs,
Iterable<? extends FeatureStructure> aCollection) {
int i = 0;
for (FeatureStructure fs : aCollection) {
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java?rev=1476394&r1=1476393&r2=1476394&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java Fri Apr 26 20:34:32 2013
@@ -24,6 +24,7 @@ package org.apache.uima.fit.util;
import static java.util.Arrays.asList;
import static org.apache.commons.lang.ArrayUtils.toObject;
import static org.apache.uima.fit.util.FSCollectionFactory.create;
+import static org.apache.uima.fit.util.FSCollectionFactory.createArrayFS;
import static org.apache.uima.fit.util.FSCollectionFactory.createBooleanArray;
import static org.apache.uima.fit.util.FSCollectionFactory.createByteArray;
import static org.apache.uima.fit.util.FSCollectionFactory.createDoubleArray;
@@ -85,15 +86,15 @@ public class FSCollectionFactoryTest {
@Test
public void testCreateFSArray() throws Exception {
- assertEquals(tokenFSs, create(createFSArray(jcas.getCas(), tokenFSs)));
+ assertEquals(tokenFSs, create(createArrayFS(jcas.getCas(), tokenFSs)));
assertEquals(
tokenFSs,
- create(createFSArray(jcas.getCas(),
+ create(createArrayFS(jcas.getCas(),
tokenFSs.toArray(new FeatureStructure[tokenFSs.size()]))));
- assertEquals(tokens, create(createFSArray(jcas.getCas(), tokens)));
+ assertEquals(tokens, create(createArrayFS(jcas.getCas(), tokens)));
assertEquals(tokens, create(createFSArray(jcas, tokens)));
assertEquals(tokens,
- create(createFSArray(jcas.getCas(), tokens.toArray(new Annotation[tokens.size()]))));
+ create(createArrayFS(jcas.getCas(), tokens.toArray(new Annotation[tokens.size()]))));
assertEquals(tokens, create(createFSArray(jcas, tokens.toArray(new Annotation[tokens.size()]))));
assertEquals(tokens,
create(createFSArray(jcas, tokens.toArray(new Annotation[tokens.size()])), Token.class));